diff --git a/buildSrc/src/main/kotlin/android/support/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/android/support/dependencies/Dependencies.kt
index f9ee8b3..48103d2 100644
--- a/buildSrc/src/main/kotlin/android/support/dependencies/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/android/support/dependencies/Dependencies.kt
@@ -30,6 +30,7 @@
 const val JSR250 = "javax.annotation:javax.annotation-api:1.2"
 const val JUNIT = "junit:junit:4.12"
 const val KOTLIN_STDLIB = "org.jetbrains.kotlin:kotlin-stdlib:1.2.0"
+const val LINT = "com.android.tools.lint:lint:26.0.0"
 const val MOCKITO_CORE = "org.mockito:mockito-core:2.7.6"
 const val MULTIDEX = "com.android.support:multidex:1.0.1"
 const val REACTIVE_STREAMS = "org.reactivestreams:reactive-streams:1.0.0"
diff --git a/settings.gradle b/settings.gradle
index 52c05d3..7b6c30d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -115,6 +115,9 @@
 include ':webkit'
 project(':webkit').projectDir = new File(rootDir, 'webkit')
 
+include ':webkit-codegen'
+project(':webkit-codegen').projectDir = new File(rootDir, 'webkit-codegen')
+
 /////////////////////////////
 //
 // Samples
diff --git a/webkit-codegen/.gitignore b/webkit-codegen/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/webkit-codegen/.gitignore
diff --git a/webkit-codegen/OWNERS b/webkit-codegen/OWNERS
new file mode 100644
index 0000000..5d88928
--- /dev/null
+++ b/webkit-codegen/OWNERS
@@ -0,0 +1,5 @@
+boliu@google.com
+michaelbai@google.com
+tobiasjs@google.com
+torne@google.com
+gsennton@google.com
diff --git a/webkit-codegen/build.gradle b/webkit-codegen/build.gradle
new file mode 100644
index 0000000..92090e1
--- /dev/null
+++ b/webkit-codegen/build.gradle
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static android.support.dependencies.DependenciesKt.*
+
+apply plugin: 'maven'
+apply plugin: 'application'
+
+mainClassName = "androidx.webkit.internal.codegen.Main"
+
+dependencies {
+    compile(JAVAPOET)
+    compile(LINT)
+
+    testCompile(JUNIT)
+}
diff --git a/webkit-codegen/src/main/java/androidx/webkit/internal/codegen/Main.java b/webkit-codegen/src/main/java/androidx/webkit/internal/codegen/Main.java
new file mode 100644
index 0000000..5a5f0f2
--- /dev/null
+++ b/webkit-codegen/src/main/java/androidx/webkit/internal/codegen/Main.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.webkit.internal.codegen;
+
+/**
+ * Main entry point class for the WebView Support Library code generation tool.
+ */
+public class Main {
+
+    /**
+     * Main entry point for the WebView Support Library code generation tool.
+     */
+    public static void main(String[] args) {
+    }
+}
diff --git a/webkit-codegen/src/test/resources/IGNORE_CHECKSTYLE b/webkit-codegen/src/test/resources/IGNORE_CHECKSTYLE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/webkit-codegen/src/test/resources/IGNORE_CHECKSTYLE