Merge "Add Lombok AST 0.2.1."
diff --git a/common/lombok-ast/Android.mk b/common/lombok-ast/Android.mk
index 451d1bb..b4f6d65 100644
--- a/common/lombok-ast/Android.mk
+++ b/common/lombok-ast/Android.mk
@@ -16,7 +16,9 @@
include $(CLEAR_VARS)
-LOCAL_PREBUILT_JAVA_LIBRARIES := lombok-ast-0.2$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+ lombok-ast-0.2$(COMMON_JAVA_PACKAGE_SUFFIX) \
+ lombok-ast-0.2.1$(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_MODULE_TAGS := optional
diff --git a/common/lombok-ast/PREBUILT b/common/lombok-ast/PREBUILT
index 7f3f9ba..fa137c1 100644
--- a/common/lombok-ast/PREBUILT
+++ b/common/lombok-ast/PREBUILT
@@ -6,11 +6,17 @@
http://projectlombok.org/
-Specifically, changeset df3fbf80b9ac3efe67a3b1d2713a0de30b6a74d5
+Specifically, changeset 3c4f94d418b58d55d0facebf2bfbb362d4bf3bdd
from
https://github.com/rzwitserloot/lombok.ast
-NOTE: Lombok.AST was combined with Guava 13.0.1 to match
+NOTE 1: The 0.2.1 bits were patched by this CL:
+https://github.com/tnorbye/lombok.ast
+which basically adds an extra field to the nodes to track
+the original source AST node. The lombok-ast-0.2.1-src.zip
+includes these diffs.
+
+NOTE 2: Lombok.AST was combined with Guava 13.0.1 to match
what is used in the rest of the tools, and Guava was also
removed from the lombok binary (which by default jarjar's it
into the lombok.jar), since it will always be used in a
diff --git a/common/lombok-ast/lombok-ast-0.2.1-src.zip b/common/lombok-ast/lombok-ast-0.2.1-src.zip
new file mode 100644
index 0000000..f50e604
--- /dev/null
+++ b/common/lombok-ast/lombok-ast-0.2.1-src.zip
Binary files differ
diff --git a/common/lombok-ast/lombok-ast-0.2.1.jar b/common/lombok-ast/lombok-ast-0.2.1.jar
new file mode 100644
index 0000000..a4744ad
--- /dev/null
+++ b/common/lombok-ast/lombok-ast-0.2.1.jar
Binary files differ
