diff options
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index 6036f2e..69ff2da 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -179,19 +179,20 @@ include $(BUILD_SYSTEM)/node_fns.mk include $(BUILD_SYSTEM)/product.mk include $(BUILD_SYSTEM)/device.mk -ifneq ($(strip $(TARGET_BUILD_APPS)),) -# An unbundled app build needs only the core product makefiles. -all_product_configs := $(call get-product-makefiles,\ - $(SRC_TARGET_DIR)/product/AndroidProducts.mk) +# A CM build needs only the CM product makefiles. +ifneq ($(CM_BUILD),) + all_product_configs := $(shell ls device/*/$(CM_BUILD)/cm.mk) else - ifneq ($(CM_BUILD),) - all_product_configs := $(shell ls device/*/$(CM_BUILD)/cm.mk) + ifneq ($(strip $(TARGET_BUILD_APPS)),) + # An unbundled app build needs only the core product makefiles. + all_product_configs := $(call get-product-makefiles,\ + $(SRC_TARGET_DIR)/product/AndroidProducts.mk) else # Read in all of the product definitions specified by the AndroidProducts.mk # files in the tree. all_product_configs := $(get-all-product-makefiles) - endif -endif + endif # TARGET_BUILD_APPS +endif # CM_BUILD ifeq ($(CM_BUILD),) # Find the product config makefile for the current product. |