tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of a3aea5b6 to jb-mr2-dev

Browse source 
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
This commit is contained in:
Raphael Moll 2013-03-14 12:41:16 -07:00
commit cdfb5bac3a
4 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/main.mk
View file

@ -427,8 +427,8 @@ SDK_ONLY := true
endif endif
ifeq ($(SDK_ONLY),true) ifeq ($(SDK_ONLY),true)
include $(TOPDIR)sdk/build/sdk_only_whitelist.mk include $(TOPDIR)sdk/build/windows_sdk_whitelist.mk
include $(TOPDIR)development/build/sdk_only_whitelist.mk include $(TOPDIR)development/build/windows_sdk_whitelist.mk
# Exclude tools/acp when cross-compiling windows under linux # Exclude tools/acp when cross-compiling windows under linux
ifeq ($(findstring Linux,$(UNAME)),) ifeq ($(findstring Linux,$(UNAME)),)

1
target/product/core.mk
View file

@ -70,7 +70,6 @@ PRODUCT_PACKAGES += \
libstagefright_soft_vpxenc \ libstagefright_soft_vpxenc \
libvariablespeed \ libvariablespeed \
libwebrtc_audio_preprocessing \ libwebrtc_audio_preprocessing \
lint \
mdnsd \ mdnsd \
mms-common \ mms-common \
requestsync \ requestsync \

1
target/product/mini.mk
View file

@ -142,7 +142,6 @@ PRODUCT_PACKAGES += \
libwebrtc_audio_preprocessing \ libwebrtc_audio_preprocessing \
libwilhelm \ libwilhelm \
libz \ libz \
lint \
mdnsd \ mdnsd \
network \ network \
pand \ pand \

5
target/product/sdk.mk
View file

@ -53,11 +53,6 @@ PRODUCT_PACKAGES := \
CubeLiveWallpapers \ CubeLiveWallpapers \
QuickSearchBox \ QuickSearchBox \
WidgetPreview \ WidgetPreview \
monkeyrunner \
guavalib \
jsr305lib \
jython \
jsilver \
librs_jni \ librs_jni \
ConnectivityTest \ ConnectivityTest \
GpsLocationTest \ GpsLocationTest \