From bb05c8fc87643e7594b53b0fc6a3217745a2b0a3 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Sun, 8 Jan 2017 01:01:52 -0600 Subject: core: move platform-specific helper macros to target makefiles * These (qcom specifically) are now needed sooner than we had previously been importing them. Include them within their _target.mk makefiles. This ensures they'll be imported before their macros are needed. Change-Id: I06c6ab66446e2f0b54c245cf6c2cf665b649e0c9 --- core/main.mk | 6 ------ core/mtk_target.mk | 3 +++ core/qcom_target.mk | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/main.mk b/core/main.mk index 6560375..b82cd6a 100644 --- a/core/main.mk +++ b/core/main.mk @@ -105,12 +105,6 @@ include $(BUILD_SYSTEM)/config.mk # be generated correctly include $(BUILD_SYSTEM)/cleanbuild.mk -# Bring in Qualcomm helper macros -include $(BUILD_SYSTEM)/qcom_utils.mk - -# Bring in Mediatek helper macros too -include $(BUILD_SYSTEM)/mtk_utils.mk - # Include the google-specific config -include vendor/google/build/config.mk diff --git a/core/mtk_target.mk b/core/mtk_target.mk index 7c3ba1f..bc03eba 100644 --- a/core/mtk_target.mk +++ b/core/mtk_target.mk @@ -1,3 +1,6 @@ +# Bring in Mediatek helper macros +include $(BUILD_SYSTEM)/mtk_utils.mk + ifeq ($(BOARD_USES_MTK_HARDWARE),true) mtk_flags := -DMTK_HARDWARE diff --git a/core/qcom_target.mk b/core/qcom_target.mk index a8ff03a..40b1775 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -1,5 +1,8 @@ # Target-specific configuration +# Bring in Qualcomm helper macros +include $(BUILD_SYSTEM)/qcom_utils.mk + # Populate the qcom hardware variants in the project pathmap. define ril-set-path-variant $(call project-set-path-variant,ril,TARGET_RIL_VARIANT,hardware/$(1)) -- cgit v1.1