Merge "Revert to building builder-model from source"
diff --git a/common/uast/BUILD b/common/uast/BUILD
new file mode 100644
index 0000000..f8bc80c
--- /dev/null
+++ b/common/uast/BUILD
@@ -0,0 +1,6 @@
+
+java_import(
+    name = "uast-145.597.3",
+    jars = ["uast-145.597.3.jar"],
+    visibility = ["//visibility:public"],
+)
diff --git a/common/uast/MODULE_LICENSE_APACHE2 b/common/uast/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/uast/MODULE_LICENSE_APACHE2
diff --git a/common/uast/PREBUILT b/common/uast/PREBUILT
new file mode 100644
index 0000000..4e90feb
--- /dev/null
+++ b/common/uast/PREBUILT
@@ -0,0 +1,6 @@
+The objects in this prebuilt directory can be rebuilt
+using 
+(1) The tools/base/misc/psi-extractor library, at revision:
+
+(2) Pointing it a build of Android Studio or IntelliJ with the version tag:
+    idea/145.597.3
diff --git a/common/uast/README b/common/uast/README
new file mode 100644
index 0000000..4fee3c9
--- /dev/null
+++ b/common/uast/README
@@ -0,0 +1,7 @@
+This library is a subset of IntelliJ IDEA's PSI API, extracted
+via the psi extration tool in tools/base/misc/psi-extractor/.
+
+This jar is extracted into the tools/base/lint/libs/uast
+library, which is a Java library packaged along with the
+rest of the tools libraries such that they can be published
+and signed using Gradle's machinery.
diff --git a/common/uast/uast-145.597.3.jar b/common/uast/uast-145.597.3.jar
new file mode 100644
index 0000000..d937d59
--- /dev/null
+++ b/common/uast/uast-145.597.3.jar
Binary files differ