diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-03-28 17:43:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-28 17:43:50 -0700 |
| commit | 16292ce718a05da7f28858bbd15d56df51aacbd4 (patch) | |
| tree | 9c18265c7a93712ce0e3eee3e27a210a6c192fa8 | |
| parent | 2396a0db9264d5b1c1243d9eb9c563d43f5e586e (diff) | |
| parent | 53d2a9a1acd2182a525401f3c1a82faff178a9d8 (diff) | |
| download | build-16292ce718a05da7f28858bbd15d56df51aacbd4.zip build-16292ce718a05da7f28858bbd15d56df51aacbd4.tar.gz build-16292ce718a05da7f28858bbd15d56df51aacbd4.tar.bz2 | |
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.
| -rw-r--r-- | core/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 2377626..0af846e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 |