diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-10-14 12:43:28 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-06 16:54:58 -0700 |
| commit | 3ead6f9ce08762752ebce7301c5bdb28d5d9244f (patch) | |
| tree | e97491e2546dee48598809f8aceb698d113317e1 /core/product_config.mk | |
| parent | a0f3e47e4431a4f97b9a32885612c52cd8f8fe68 (diff) | |
| download | build-3ead6f9ce08762752ebce7301c5bdb28d5d9244f.zip build-3ead6f9ce08762752ebce7301c5bdb28d5d9244f.tar.gz build-3ead6f9ce08762752ebce7301c5bdb28d5d9244f.tar.bz2 | |
product_config: Set CM_BUILD priority above TARGET_BUILD_APPS
Even if we are doing TARGET_BUILD_APPS, we may want to use a cm
target for building.
Change-Id: Ic8053bc679fa8b726be90e611aeaacdf1850cabc
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. |