diff options
| author | Brett Chabot <brettchabot@google.com> | 2014-09-04 23:18:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 23:18:42 +0000 |
| commit | ba059b9c7e1d20bc65b2a77d1f699bfaf4e320dd (patch) | |
| tree | 25ed9ccd5fd444acf5cc7d58642782777d71cd0d | |
| parent | 2341298d513af7c0367bc5b842a189add1a4ecc6 (diff) | |
| parent | 5ca32dea599eb15b16381a47c5b669dfaf655f18 (diff) | |
| download | tradefederation-ba059b9c7e1d20bc65b2a77d1f699bfaf4e320dd.tar.gz | |
Merge "Switch to guava15 in tf"
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | remote/.classpath | 2 | ||||
| -rw-r--r-- | remote/Android.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.classpath b/.classpath index cea4eacee..3a2c618c7 100644 --- a/.classpath +++ b/.classpath @@ -4,10 +4,8 @@ <classpathentry kind="src" path="res"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar"/> - <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/out/host/common/obj/JAVA_LIBRARIES/jline-1.0_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/jline/src"/> <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/junit_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/junit/src"/> - <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/json/json-prebuilt.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/tf-remote-client"/> <classpathentry kind="output" path="bin"/> diff --git a/remote/.classpath b/remote/.classpath index fc4759a23..ac373ae4d 100644 --- a/remote/.classpath +++ b/remote/.classpath @@ -5,5 +5,7 @@ <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/json/json-prebuilt.jar"/> <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 combineaccessrules="false" kind="src" path="/ddmlib"/> + <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/guava/guava-15.0.jar"/> + <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/jsr305lib_intermediates/javalib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/remote/Android.mk b/remote/Android.mk index 0793f3353..99a63015e 100644 --- a/remote/Android.mk +++ b/remote/Android.mk @@ -26,7 +26,7 @@ LOCAL_MODULE := tf-remote-client LOCAL_MODULE_TAGS := optional # only depend on ddmlib for the Log class LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt -LOCAL_STATIC_JAVA_LIBRARIES := json-prebuilt guavalib +LOCAL_STATIC_JAVA_LIBRARIES := json-prebuilt jsr305lib guava-15.0-prebuilt include $(BUILD_HOST_JAVA_LIBRARY) |