am cdfb5bac: resolved conflicts for merge of a3aea5b6 to jb-mr2-dev

* commit 'cdfb5bac3a5721b895cea4789ac2384ff6546992': Build SDK using prebuilts/devtools.
2013-03-14 19:48:24 +00:00
parent a06f74566a cdfb5bac3a
commit 85754ea5f2
4 changed files with 2 additions and 9 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -427,8 +427,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
@@ -70,7 +70,6 @@ PRODUCT_PACKAGES += \
    libstagefright_soft_vpxenc \
    libvariablespeed \
    libwebrtc_audio_preprocessing \
-    lint \
    mdnsd \
    mms-common \
    requestsync \
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -142,7 +142,6 @@ PRODUCT_PACKAGES += \
    libwebrtc_audio_preprocessing \
    libwilhelm \
    libz \
-    lint \
    mdnsd \
    network \
    pand \
--- 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 \