Merge "SDK: Also read sdk/build/tools.OS.atree"

This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

(cherry picked from commit 3ab307a68cbc30ab37d15f62e88dd19b51ac9632)

Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24

diff --git a/core/Makefile b/core/Makefile
index b657b48..e136c45 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -1388,6 +1388,12 @@ 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
+ifneq (,$(strip $(wildcard sdk/build/tools.$(HOST_OS).atree)))
+  sdk_tools_atree_files += sdk/build/tools.$(HOST_OS).atree
+endif
+ifneq (,$(strip $(wildcard sdk/build/tools.$(HOST_OS)-$(HOST_ARCH).atree)))
+  sdk_tools_atree_files += sdk/build/tools.$(HOST_OS)-$(HOST_ARCH).atree
+endif
 
 sdk_atree_files := \
        $(atree_dir)/sdk.exclude.atree \