am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
  Make the module existence check nonfatal
This commit is contained in:
Ying Wang 2014-02-18 19:24:39 +00:00 committed by Android Git Automerger
commit 6d5ca9f46b

View file

@ -769,7 +769,7 @@ ifdef is_sdk_build
dangling_modules := $(filter-out %64,$(dangling_modules))
endif
ifneq ($(dangling_modules),)
$(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)
$(warning: Modules '$(dangling_modules)' in PRODUCT_PACKAGES have nothing to install!)
endif
$(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \
$(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\