commit bec954d05e0eeec178c796d2332ee9a86becb5dc
author Ying Wang <wangying@google.com> Wed Feb 12 01:31:21 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 12 01:31:22 2014 +0000
tree 531d0bf194d281388806ff08ffae5e86cac03a85
parent b12cce10fab8c9adda213506be4ce675104655da
parent d18e570fbaef9fdc6605ed75960641416a370a79

Merge "Clean up dangling module names"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index df2dea8..871f51b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -753,9 +753,13 @@
 
   # Ensure every module listed in PRODUCT_PACKAGES* gets something installed
   # TODO: Should we do this for all builds and not just the sdk?
+  dangling_modules :=
   $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
     $(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), \
     $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
       $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!)))

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 963d56a..04d6e5f 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -44,18 +44,12 @@
     SystemUI \
     TeleService \
     CalendarProvider \
-    bluetooth-health \
     WallpaperCropper
 
 PRODUCT_PACKAGES += \
-    audio \
     clatd \
     clatd.conf \
-    dhcpcd.conf \
-    network \
-    pand \
-    pppd \
-    sdptool
+    pppd
 
 PRODUCT_PACKAGES += \
     librs_jni \