Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 172ed00..24d57b2 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -244,6 +244,7 @@
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
+ $(PRIVATE_TARGET_LIBGCC) \
$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
-o $@ \
$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -258,10 +259,8 @@
-Wl,-dynamic-linker,/system/bin/linker \
-Wl,--gc-sections \
-Wl,-z,nocopyreloc \
- -o $@ \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \
- $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \
$(PRIVATE_ALL_OBJECTS) \
-Wl,--whole-archive \
@@ -270,6 +269,9 @@
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
+ $(PRIVATE_TARGET_LIBGCC) \
+ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
+ -o $@ \
$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
$(PRIVATE_LDFLAGS) \
$(PRIVATE_TARGET_FDO_LIB) \
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 19a588c..751b481 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 \
