Upgrade from Guava 10.0.1 to Guava 13.0.1.
Change-Id: Ib1685a4155ec39871f013082f94b58f92241eca2
diff --git a/common/guava-tools/Android.mk b/common/guava-tools/Android.mk
index 635f40f..ed50ad5 100644
--- a/common/guava-tools/Android.mk
+++ b/common/guava-tools/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- guava-tools:guava-10.0.1$(COMMON_JAVA_PACKAGE_SUFFIX)
+ guava-tools:guava-13.0.1$(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_MODULE_TAGS := optional
diff --git a/common/guava-tools/PREBUILT b/common/guava-tools/PREBUILT
index bf3d431..e0b607a 100644
--- a/common/guava-tools/PREBUILT
+++ b/common/guava-tools/PREBUILT
@@ -1,7 +1,8 @@
The objects in this prebuilt directory can be rebuilt
using the source archive hosted at
-http://search.maven.org/remotecontent?filepath=com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar
+http://search.maven.org/remotecontent?filepath=com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar
Source code repository:
+http://code.google.com/p/guava-libraries/wiki/Release13
https://code.google.com/p/guava-libraries/
diff --git a/common/guava-tools/guava-10.0.1.jar b/common/guava-tools/guava-10.0.1.jar
deleted file mode 100644
index d107c0f..0000000
--- a/common/guava-tools/guava-10.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/common/guava-tools/guava-13.0.1.jar b/common/guava-tools/guava-13.0.1.jar
new file mode 100644
index 0000000..09c5449
--- /dev/null
+++ b/common/guava-tools/guava-13.0.1.jar
Binary files differ
diff --git a/common/guava-tools/src.zip b/common/guava-tools/src.zip
index a3ab179..c001c79 100644
--- a/common/guava-tools/src.zip
+++ b/common/guava-tools/src.zip
Binary files differ
diff --git a/common/lombok-ast/PREBUILT b/common/lombok-ast/PREBUILT
index 78643df..7f3f9ba 100644
--- a/common/lombok-ast/PREBUILT
+++ b/common/lombok-ast/PREBUILT
@@ -9,3 +9,33 @@
Specifically, changeset df3fbf80b9ac3efe67a3b1d2713a0de30b6a74d5
from
https://github.com/rzwitserloot/lombok.ast
+
+NOTE: 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
+context where Guava is already ready, so no point in bundling
+a private copy.
+
+diff --git a/build.xml b/build.xml
+index 3575ecf..11570d0 100644
+--- a/build.xml
++++ b/build.xml
+@@ -231,6 +231,7 @@
+ <unjar dest="build/lombok.ast">
+ <path refid="runtime.path" />
+ </unjar>
++ <delete dir="build/lombok.ast/com/google" />
+ </target>
+
+ <target name="dist" depends="compile, version, unpackLibs" description="Creates distributable.">
+@@ -240,7 +241,9 @@
+ <fileset dir="build/lombok.ast" />
+ <fileset dir="." includes="LICENSE" />
+ <fileset dir="." includes="AUTHORS" />
++<!--
+ <rule pattern="com.google.common.**" result="lombok.ast.libs.com.google.common.@1" />
++-->
+ <rule pattern="org.parboiled.**" result="lombok.ast.libs.org.parboiled.@1" />
+ <rule pattern="com.zwitserloot.cmdreader.**" result="lombok.ast.libs.com.zwitserloot.cmdreader.@1
+ <manifest>
diff --git a/common/lombok-ast/lombok-ast-0.2.jar b/common/lombok-ast/lombok-ast-0.2.jar
index 33c9d6f..386c63c 100644
--- a/common/lombok-ast/lombok-ast-0.2.jar
+++ b/common/lombok-ast/lombok-ast-0.2.jar
Binary files differ
