am 0ec2f3df: Merge "Build SDK using prebuilts/devtools."

* commit '0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3': Build SDK using prebuilts/devtools.
2013-03-14 11:44:07 -07:00
parent e9d67dccb0 0ec2f3df4b
commit a3aea5b6eb
4 changed files with 2 additions and 10 deletions
--- 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)),)
--- 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

--- 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 \
--- 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 \