diff options
| author | Omari Stephens <xsdg@android.com> | 2014-09-17 17:20:36 -0700 |
|---|---|---|
| committer | Omari Stephens <xsdg@android.com> | 2014-09-18 19:40:53 -0700 |
| commit | f4f4289193b0156e8f45e65964988800f05fe7ab (patch) | |
| tree | a8d309c3d139c995b49ba695526c202f4aa00bff | |
| parent | 52233d339c9c66dab45f5618a9bb6ec93f34c938 (diff) | |
| download | tradefederation-f4f4289193b0156e8f45e65964988800f05fe7ab.tar.gz | |
DO NOT MERGE Revert "Switch to guava15 in tf"android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
Guava15 doesn't exist yet in lmp-dev
This reverts commit 5ca32dea599eb15b16381a47c5b669dfaf655f18.
Bug: 13506843
Change-Id: I4d9f010cb41384352a4f823d7c413f39af06c24d
| -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 3a2c618c7..cea4eacee 100644 --- a/.classpath +++ b/.classpath @@ -4,8 +4,10 @@ <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 ac373ae4d..fc4759a23 100644 --- a/remote/.classpath +++ b/remote/.classpath @@ -5,7 +5,5 @@ <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 99a63015e..0793f3353 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 jsr305lib guava-15.0-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES := json-prebuilt guavalib include $(BUILD_HOST_JAVA_LIBRARY) |