From 433febb3c4593e777ef393371b6e99dcce9a7217 Mon Sep 17 00:00:00 2001 From: Griff Hazen Date: Fri, 28 Feb 2014 08:45:59 -0800 Subject: [PATCH] Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides. Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28 --- core/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/Makefile b/core/Makefile index 7089f6da2..78e8db56f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1557,12 +1557,6 @@ sdk_atree_files := \ $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \ $(sdk_tools_atree_files) -ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES),) -sdk_atree_files += $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES) -else -sdk_atree_files += $(atree_dir)/sdk.atree -endif - # development/build/sdk-android-.atree is used to differentiate # between architecture models (e.g. ARMv5TE versus ARMv7) when copying # files like the kernel image. We use TARGET_CPU_ABI because we don't @@ -1571,6 +1565,12 @@ ifneq (,$(strip $(wildcard $(atree_dir)/sdk-android-$(TARGET_CPU_ABI).atree))) sdk_atree_files += $(atree_dir)/sdk-android-$(TARGET_CPU_ABI).atree endif +ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES),) +sdk_atree_files += $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES) +else +sdk_atree_files += $(atree_dir)/sdk.atree +endif + deps := \ $(target_notice_file_txt) \ $(tools_notice_file_txt) \ -- 2.11.0