am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."

* commit 'e2f06adb8873ede16f829690b4dbab07b8121aa8':
  Don't check the existence for the 64-bit modules for 32-bit SDK build.
This commit is contained in:
Ying Wang 2014-03-07 19:33:21 +00:00 committed by Android Git Automerger
commit 542b98ebe9

View file

@ -757,6 +757,10 @@ ifdef is_sdk_build
$(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
$(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
$(eval dangling_modules += $(m)))) $(eval dangling_modules += $(m))))
ifneq ($(TARGET_IS_64_BIT),true)
# We know those 64-bit modules don't exist in the 32-bit SDK build.
dangling_modules := $(filter-out %64,$(dangling_modules))
endif
ifneq ($(dangling_modules),) ifneq ($(dangling_modules),)
$(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!) $(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)
endif endif