diff options
| author | Brett Chabot <brettchabot@google.com> | 2014-09-04 23:18:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 23:18:54 +0000 |
| commit | a5b19b2e04d4ce6450c7b991d9687e176e126d44 (patch) | |
| tree | 3695ce349285e43020d39581c8d482e572c49a05 | |
| parent | e64f495107aaa91f2e40e7e5c92c700d58115fa3 (diff) | |
| parent | defff778cba341c03f98c7b9b935f269f40e9f74 (diff) | |
| download | loganalysis-a5b19b2e04d4ce6450c7b991d9687e176e126d44.tar.gz | |
Merge "Switch to guava 15 in loganalysis"
| -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) |