openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am bec954d0: Merge "Clean up dangling module names" 

* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
  Clean up dangling module names
This commit is contained in:
Ying Wang 2014-03-07 02:27:32 +00:00 committed by Android Git Automerger
parent e23ee3ec25 bec954d05e
commit 14040db928
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/main.mk
View File

@ -753,9 +753,13 @@ ifdef is_sdk_build
# Ensure every module listed in PRODUCT_PACKAGES* gets something installed # Ensure every module listed in PRODUCT_PACKAGES* gets something installed
# TODO: Should we do this for all builds and not just the sdk? # TODO: Should we do this for all builds and not just the sdk?
dangling_modules :=
$(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
$(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
$(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!))) $(eval dangling_modules += $(m))))
ifneq ($(dangling_modules),)
$(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)
endif
$(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \ $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \
$(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
$(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!))) $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!)))

8
target/product/generic_no_telephony.mk
View File

@ -44,18 +44,12 @@ PRODUCT_PACKAGES := \
SystemUI \ SystemUI \
TeleService \ TeleService \
CalendarProvider \ CalendarProvider \
bluetooth-health \
WallpaperCropper WallpaperCropper
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
audio \
clatd \ clatd \
clatd.conf \ clatd.conf \
dhcpcd.conf \ pppd
network \
pand \
pppd \
sdptool
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
librs_jni \ librs_jni \