openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 53d2a9a1: am 440d7e1e: am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension." 

* commit '53d2a9a1acd2182a525401f3c1a82faff178a9d8':
  Support target-specific sdk/build/tools.atree extension.
This commit is contained in:
David 'Digit' Turner 2011-03-28 17:43:50 -07:00 committed by Android Git Automerger
parent 2396a0db92 53d2a9a1ac
commit 16292ce718
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/Makefile
View File

@ -1342,11 +1342,21 @@ endif
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 @@ deps := \
$(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