resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
diff --git a/core/main.mk b/core/main.mk
index 7f3d706..e671722 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -427,8 +427,8 @@
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 ef640b8..0e7aad6 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -70,7 +70,6 @@
libstagefright_soft_vpxenc \
libvariablespeed \
libwebrtc_audio_preprocessing \
- lint \
mdnsd \
mms-common \
requestsync \
diff --git a/target/product/mini.mk b/target/product/mini.mk
index bcaab92..10aa1a4 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -142,7 +142,6 @@
libwebrtc_audio_preprocessing \
libwilhelm \
libz \
- lint \
mdnsd \
network \
pand \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 646881e..f9e69cb 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -53,11 +53,6 @@
CubeLiveWallpapers \
QuickSearchBox \
WidgetPreview \
- monkeyrunner \
- guavalib \
- jsr305lib \
- jython \
- jsilver \
librs_jni \
ConnectivityTest \
GpsLocationTest \