Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caee911a authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

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
(cherry picked from commit d559aacd)
parent 0226dbfb

core/product_config.mk

+9 −8
Original line number Diff line number Diff line
@@ -179,19 +179,20 @@ include $(BUILD_SYSTEM)/node_fns.mk 
include $(BUILD_SYSTEM)/product.mk

include $(BUILD_SYSTEM)/device.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 ($(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

  ifneq ($(CM_BUILD),)

    all_product_configs := $(shell ls device/*/$(CM_BUILD)/cm.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 # TARGET_BUILD_APPS

endif # CM_BUILD

endif



ifeq ($(CM_BUILD),)

# Find the product config makefile for the current product.