diff options
| author | Raphael Moll <ralf@android.com> | 2013-02-05 10:55:22 -0800 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2013-02-06 19:55:53 -0800 |
| commit | b15ea7875a9a4101d4be7e547950b7d2b64c1464 (patch) | |
| tree | 6523e17c6056b4bbff28648323ec2150518b6cf4 /sdkmanager | |
| parent | 4ae82e1d50430c049c4c4fb520cb32c55c651654 (diff) | |
| download | sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.zip sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.gz sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.bz2 | |
Change more SDK libs to prebuilts.
Requires prebuilds/devtools.git I913a29e5f40db99871701461aad6fc38483015d2
To update the prebuilts, you need tools/base.git and the
prebuilts/devtools/update_jars.sh script.
This is supposed to be an intermediary step as we switch to tools/base.
Change-Id: I3dcccfdd9dc243a22a5bfd9db6779d24285db1ac
Diffstat (limited to 'sdkmanager')
| -rw-r--r-- | sdkmanager/libs/sdklib/Android.mk | 7 | ||||
| -rw-r--r-- | sdkmanager/libs/sdkuilib/Android.mk | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sdkmanager/libs/sdklib/Android.mk b/sdkmanager/libs/sdklib/Android.mk index dfd3fcb..ef0362d 100644 --- a/sdkmanager/libs/sdklib/Android.mk +++ b/sdkmanager/libs/sdklib/Android.mk @@ -24,10 +24,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := sdklib LOCAL_MODULE_TAGS := optional -# IMPORTANT: if you add a new dependency here, please make sure -# to also check the following files: -# sdkmanager/sdklib/manifest.txt -# sdkmanager/app/etc/android.bat + LOCAL_JAVA_LIBRARIES := \ common \ commons-codec-1.4 \ @@ -42,7 +39,7 @@ LOCAL_JAVA_LIBRARIES := \ layoutlib_api LOCAL_PREBUILT_JAVA_LIBRARIES := \ - ../../../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX) + ../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX) include $(BUILD_HOST_PREBUILT) diff --git a/sdkmanager/libs/sdkuilib/Android.mk b/sdkmanager/libs/sdkuilib/Android.mk index b746632..df35432 100644 --- a/sdkmanager/libs/sdkuilib/Android.mk +++ b/sdkmanager/libs/sdkuilib/Android.mk @@ -24,10 +24,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := sdkuilib LOCAL_MODULE_TAGS := optional -# IMPORTANT: if you add a new dependency here, please make sure -# to also check the following file: -# sdkmanager/app/etc/android.bat -# (Note: there is no manifest.txt for sdkuilib.) + LOCAL_JAVA_LIBRARIES := \ common \ commons-codec-1.4 \ @@ -45,7 +42,7 @@ LOCAL_JAVA_LIBRARIES := \ swtmenubar LOCAL_PREBUILT_JAVA_LIBRARIES := \ - ../../../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX) + ../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX) include $(BUILD_HOST_PREBUILT) |