aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-09-13 17:22:57 -0700
committerXavier Ducrohet <xav@android.com>2012-09-13 19:00:32 -0700
commit5910447b10dd39c9591aa45366c2aacce07af2af (patch)
tree4ca343e63c67c4a57435e3f0ceb76ad21a5805e0 /sdkmanager
parent37612be71d9cdcb9d992ec22ed8b605df8b2994d (diff)
downloadsdk-5910447b10dd39c9591aa45366c2aacce07af2af.zip
sdk-5910447b10dd39c9591aa45366c2aacce07af2af.tar.gz
sdk-5910447b10dd39c9591aa45366c2aacce07af2af.tar.bz2
Add guava to common and sdklib.
Change-Id: Ic465232c7df736d2823b391c1f973c6ae5d81833
Diffstat (limited to 'sdkmanager')
-rw-r--r--sdkmanager/libs/sdklib/.classpath2
-rw-r--r--sdkmanager/libs/sdklib/Android.mk2
2 files changed, 2 insertions, 2 deletions
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 \