resolved conflicts for merge of 6ca56b6a
to klp-modular-dev-plus-aosp
Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce
This commit is contained in:
commit
52cefc36cf
1 changed files with 1 additions and 1 deletions
|
@ -764,7 +764,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)),,\
|
||||
|
|
Loading…
Reference in a new issue