commit b1f4364868069ad10de91dbec8698ec40a3512b6
author Griff Hazen <griff@google.com> Fri Feb 28 18:10:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 28 18:10:02 2014 +0000
tree 8176177147346c6a5ec4e20fe579cd533ab6e8f8
parent 2284a1c0588802aa5b52cf6c1b8520a911cf0fac
parent d3b40d5235d76461bf60f1eac73c132a06b1a30d

am d3b40d52: am 6c23e7b8: am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.

* commit 'd3b40d5235d76461bf60f1eac73c132a06b1a30d':
  Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 8cbebff..f0e8458 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1567,12 +1567,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
@@ -1581,6 +1575,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) \