Merge "Make the module existence check nonfatal" into klp-modular-dev
diff --git a/core/main.mk b/core/main.mk
index e2b93c2..5d46c98 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -696,9 +696,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),)
+ $(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!)))