StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9fe6dc2c17ba6113ff4031feaeea7dac0ba5d5a3':
  Support target-specific sdk/build/tools.atree extension.
This commit is contained in:
David 'Digit' Turner
2011-03-23 11:07:51 -07:00
committed by Android Git Automerger
parent db0d59d1b4 9fe6dc2c17
commit 440d7e1e5b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/Makefile
View File

@@ -1326,11 +1326,21 @@ endif
atree_dir := development/build 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 := \ sdk_atree_files := \
$(atree_dir)/sdk.exclude.atree \ $(atree_dir)/sdk.exclude.atree \
$(atree_dir)/sdk.atree \ $(atree_dir)/sdk.atree \
$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \ $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
sdk/build/tools.atree $(sdk_tools_atree_files)
deps := \ deps := \
$(target_notice_file_txt) \ $(target_notice_file_txt) \
@@ -1344,7 +1354,7 @@ deps := \
$(INSTALLED_BUILD_PROP_TARGET) \ $(INSTALLED_BUILD_PROP_TARGET) \
$(ATREE_FILES) \ $(ATREE_FILES) \
$(atree_dir)/sdk.atree \ $(atree_dir)/sdk.atree \
sdk/build/tools.atree \ $(sdk_tools_atree_files) \
$(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/atree \
$(HOST_OUT_EXECUTABLES)/line_endings $(HOST_OUT_EXECUTABLES)/line_endings