am 440d7e1e: am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '440d7e1e5bb732ff8638af40e112e1df98e1f537':
Support target-specific sdk/build/tools.atree extension.
diff --git a/core/Makefile b/core/Makefile
index 2377626..0af846e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1342,11 +1342,21 @@
atree_dir := development/build
+# sdk/build/tools.atree contains the generic rules, while
+#
+# sdk/build/tools.$(TARGET_ARCH).atree contains target-specific rules
+# the latter is optional.
+#
+sdk_tools_atree_files := sdk/build/tools.atree
+ifneq (,$(strip $(wildcard sdk/build/tools.$(TARGET_ARCH).atree)))
+ sdk_tools_atree_files += sdk/build/tools.$(TARGET_ARCH).atree
+endif
+
sdk_atree_files := \
$(atree_dir)/sdk.exclude.atree \
$(atree_dir)/sdk.atree \
$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
- sdk/build/tools.atree
+ $(sdk_tools_atree_files)
deps := \
$(target_notice_file_txt) \
@@ -1360,7 +1370,7 @@
$(INSTALLED_BUILD_PROP_TARGET) \
$(ATREE_FILES) \
$(atree_dir)/sdk.atree \
- sdk/build/tools.atree \
+ $(sdk_tools_atree_files) \
$(HOST_OUT_EXECUTABLES)/atree \
$(HOST_OUT_EXECUTABLES)/line_endings