Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
diff --git a/core/Makefile b/core/Makefile
index 7089f6d..78e8db5 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1557,12 +1557,6 @@
$(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-<abi>.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 @@
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) \