aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/.classpath1
-rw-r--r--common/Android.mk1
-rw-r--r--common/build.gradle2
3 files changed, 3 insertions, 1 deletions
diff --git a/common/.classpath b/common/.classpath
index 88fb9b4..aa9b382 100644
--- a/common/.classpath
+++ b/common/.classpath
@@ -4,5 +4,6 @@
<classpathentry kind="src" path="tests/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/common/Android.mk b/common/Android.mk
index ef907f2..ebbf37c 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_JAVA_LIBRARIES := \
+ guava-tools
LOCAL_MODULE := common
diff --git a/common/build.gradle b/common/build.gradle
index ba02d70..2b043fd 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'java'
dependencies {
- compile 'com.google.guava:guava:11.0.2'
+ compile 'com.google.guava:guava:13.0.1'
testCompile 'junit:junit:3.8.1'
}