New Guava version with new ddmlib

Bug: 27642373
Change-Id: Ib08e8eaa64a778f120126387904e672395e3e40c

2 files changed, 2 insertions, 2 deletions

diff --git a/.classpath b/.classpath
index 10bf091..07a7096 100644
--- a/.classpath
+++ b/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/json/json-prebuilt.jar"/>
-	<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/guava/guava-15.0.jar"/>
+	<classpathentry kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/guava/guava-18.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Android.mk b/Android.mk
index 3dd1586..99b1ddd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,7 +23,7 @@ LOCAL_JAVACFLAGS += -g -Xlint
 
 LOCAL_MODULE := loganalysis
 LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := guava-15.0-prebuilt json-prebuilt junit
+LOCAL_STATIC_JAVA_LIBRARIES := guava-18.0-prebuilt json-prebuilt junit
 
 include $(BUILD_HOST_JAVA_LIBRARY)