commit 149fa628e537feebdbe19998e0d766d0ce36cc64
author Julien Desprez <jdesprez@google.com> Mon Jan 14 17:29:27 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 14 17:29:27 2019 +0000
tree ae2fc0818185a98b9061a2618fd0dcd3e88c66e0
parent 4110660dc04cbb60a2f1339d2c03551c4210e4af
parent be877cab0b076c36f06c01234ad5cb11fae5311c

Merge "Fix guava classpath"

.classpath

diff --git a/.classpath b/.classpath
index 07a7096..ca81bde 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 kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/guava/guava-18.0.jar"/>
+	<classpathentry kind="var" path="TRADEFED_ROOT/out/soong/.intermediates/external/guava/guava/linux_glibc_common/combined/guava.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>