diff options
author | Brett Chabot <brettchabot@google.com> | 2014-08-28 12:15:32 -0700 |
---|---|---|
committer | Brett Chabot <brettchabot@google.com> | 2014-08-28 12:15:32 -0700 |
commit | defff778cba341c03f98c7b9b935f269f40e9f74 (patch) | |
tree | a7b392dc72969927881d5893e73263c93cdee2c4 | |
parent | e337a91a147162fbad603c05c5ddffd12bff6f7d (diff) | |
download | loganalysis-defff778cba341c03f98c7b9b935f269f40e9f74.tar.gz |
Switch to guava 15 in loganalysis
Bug: 17252597
Change-Id: I87e359535c7aea42f6e669a5e83eb0b1abdd4930
-rw-r--r-- | .classpath | 2 | ||||
-rw-r--r-- | Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <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/out/host/common/obj/JAVA_LIBRARIES/guavalib_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/guava/guava/src"/> <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="output" path="bin"/> </classpath> @@ -23,7 +23,7 @@ LOCAL_JAVACFLAGS += -g -Xlint LOCAL_MODULE := loganalysis LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := guavalib json-prebuilt junit +LOCAL_STATIC_JAVA_LIBRARIES := guava-15.0-prebuilt json-prebuilt junit include $(BUILD_HOST_JAVA_LIBRARY) |