From: Ying Wang <wangying@google.com>
Date: Fri, 14 Feb 2014 21:39:42 +0000 (-0800)
Subject: Make the module existence check nonfatal
X-Git-Tag: android-x86-6.0-r1~1204^2^2~80^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b1d75bd81d7585135eb7ce8d99d4d781925791dd;p=android-x86%2Fbuild.git

Make the module existence check nonfatal

Now we have sdk variants that may inherit the non-existent module names
from the device product.

Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91
---

diff --git a/core/main.mk b/core/main.mk
index e2b93c25b..5d46c98d4 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -696,9 +696,13 @@ ifdef is_sdk_build
 
   # 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),)
+    $(warning: Modules '$(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!)))