diff options
| author | Raphael Moll <ralf@android.com> | 2013-03-14 18:31:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-14 18:31:36 +0000 |
| commit | 0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3 (patch) | |
| tree | 27d7892129aac7222aca6ae388caa5c5ecb5b1a7 | |
| parent | c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24 (diff) | |
| parent | 8a2b7707dd1bc95a69eed3c64415d1b68f2cb669 (diff) | |
| download | build-0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3.tar.gz | |
Merge "Build SDK using prebuilts/devtools."
| -rw-r--r-- | core/main.mk | 4 | ||||
| -rw-r--r-- | target/product/core.mk | 2 | ||||
| -rw-r--r-- | target/product/mini.mk | 1 | ||||
| -rw-r--r-- | target/product/sdk.mk | 5 |
4 files changed, 2 insertions, 10 deletions
diff --git a/core/main.mk b/core/main.mk index 812fd930a0..7d6b3b27ff 100644 --- a/core/main.mk +++ b/core/main.mk @@ -430,8 +430,8 @@ SDK_ONLY := true endif ifeq ($(SDK_ONLY),true) -include $(TOPDIR)sdk/build/sdk_only_whitelist.mk -include $(TOPDIR)development/build/sdk_only_whitelist.mk +include $(TOPDIR)sdk/build/windows_sdk_whitelist.mk +include $(TOPDIR)development/build/windows_sdk_whitelist.mk # Exclude tools/acp when cross-compiling windows under linux ifeq ($(findstring Linux,$(UNAME)),) diff --git a/target/product/core.mk b/target/product/core.mk index e10dc31d7f..bf055841aa 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -125,8 +125,6 @@ PRODUCT_PACKAGES += \ requestsync \ screencap \ sensorservice \ - lint \ - uiautomator \ telephony-common \ mms-common diff --git a/target/product/mini.mk b/target/product/mini.mk index b69c917623..22762ab40c 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -140,7 +140,6 @@ PRODUCT_PACKAGES += \ libwebrtc_audio_preprocessing \ libwilhelm \ libz \ - lint \ mdnsd \ mms-common \ network \ diff --git a/target/product/sdk.mk b/target/product/sdk.mk index f7a65db5b5..8382ee0a80 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -53,11 +53,6 @@ PRODUCT_PACKAGES := \ CubeLiveWallpapers \ QuickSearchBox \ WidgetPreview \ - monkeyrunner \ - guavalib \ - jsr305lib \ - jython \ - jsilver \ librs_jni \ ConnectivityTest \ GpsLocationTest \ |