am 8f5c42e7: am 2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""

* commit '8f5c42e778afc5a3bfa2c6a1c6258889690a558b':
  Merge "SDK: Also read sdk/build/tools.OS.atree"
This commit is contained in:
Raphael Moll 2012-04-10 14:46:43 -07:00 committed by Android Git Automerger
commit 048d741f0a

View file

@ -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 \