diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-13 19:01:39 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-13 19:01:40 -0700 |
| commit | d38457bd813f7591e13a58bf91655192d761d81a (patch) | |
| tree | b70505261e24e128b9cb369ea9e1c170fab5fca1 | |
| parent | 34c9f0ebc7d2265291f6f712d0b0d753949ea8c0 (diff) | |
| parent | 5910447b10dd39c9591aa45366c2aacce07af2af (diff) | |
| download | sdk-d38457bd813f7591e13a58bf91655192d761d81a.zip sdk-d38457bd813f7591e13a58bf91655192d761d81a.tar.gz sdk-d38457bd813f7591e13a58bf91655192d761d81a.tar.bz2 | |
Merge "Add guava to common and sdklib."
| -rw-r--r-- | common/.classpath | 1 | ||||
| -rw-r--r-- | common/Android.mk | 1 | ||||
| -rw-r--r-- | common/build.gradle | 2 | ||||
| -rw-r--r-- | sdkmanager/libs/sdklib/.classpath | 2 | ||||
| -rw-r--r-- | sdkmanager/libs/sdklib/Android.mk | 2 |
5 files changed, 5 insertions, 3 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' } diff --git a/sdkmanager/libs/sdklib/.classpath b/sdkmanager/libs/sdklib/.classpath index 0cb20b5..476a320 100644 --- a/sdkmanager/libs/sdklib/.classpath +++ b/sdkmanager/libs/sdklib/.classpath @@ -11,7 +11,7 @@ <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpclient-4.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpcore-4.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpmime-4.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/mkidentity/mkidentity-prebuilt.jar"/> + <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 combineaccessrules="false" kind="src" path="/dvlib"/> <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry kind="output" path="bin"/> diff --git a/sdkmanager/libs/sdklib/Android.mk b/sdkmanager/libs/sdklib/Android.mk index 9ba356b..7ff9135 100644 --- a/sdkmanager/libs/sdklib/Android.mk +++ b/sdkmanager/libs/sdklib/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAR_MANIFEST := manifest.txt LOCAL_JAVA_LIBRARIES := \ layoutlib_api \ common \ - mkidentity-prebuilt \ + guava-tools \ commons-compress-1.0 \ httpclient-4.1.1 \ httpcore-4.1 \ |