From 8a2b7707dd1bc95a69eed3c64415d1b68f2cb669 Mon Sep 17 00:00:00 2001
From: Raphael Moll <ralf@android.com>
Date: Wed, 13 Mar 2013 15:30:35 -0700
Subject: [PATCH] Build SDK using prebuilts/devtools.

Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
  any more but in the sdk/product.mk instead (which they were.)

Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
---
 core/main.mk           | 4 ++--
 target/product/core.mk | 2 --
 target/product/mini.mk | 1 -
 target/product/sdk.mk  | 5 -----
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 812fd930a..7d6b3b27f 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 e10dc31d7..bf055841a 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 b69c91762..22762ab40 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 f7a65db5b..8382ee0a8 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 \