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 /sdkmanager | |
| 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."
Diffstat (limited to 'sdkmanager')
| -rw-r--r-- | sdkmanager/libs/sdklib/.classpath | 2 | ||||
| -rw-r--r-- | sdkmanager/libs/sdklib/Android.mk | 2 |
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 \ |