From defff778cba341c03f98c7b9b935f269f40e9f74 Mon Sep 17 00:00:00 2001
From: Brett Chabot <brettchabot@google.com>
Date: Thu, 28 Aug 2014 12:15:32 -0700
Subject: Switch to guava 15 in loganalysis

Bug: 17252597
Change-Id: I87e359535c7aea42f6e669a5e83eb0b1abdd4930
---
 .classpath | 2 +-
 Android.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index 3c2d00c..10bf091 100644
--- a/.classpath
+++ b/.classpath
@@ -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>
diff --git a/Android.mk b/Android.mk
index 7e1b007..3dd1586 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
 
-- 
cgit v1.2.3