diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-09-27 15:51:32 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-09-27 15:51:32 -0700 |
| commit | ffd5087ec81a281b1299048b4282dad593ccd703 (patch) | |
| tree | b8d58fcfdfbb16b758c87ca2e1b23df552c315a8 | |
| parent | b368bba41c4fb9b5c76a56cb1bd850517ef9df53 (diff) | |
| download | build-ffd5087ec81a281b1299048b4282dad593ccd703.tar.gz | |
Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.
Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.
Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 830359271c..71b42a20e1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1223,7 +1223,8 @@ atree_dir := development/build sdk_atree_files := \ $(atree_dir)/sdk.exclude.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 deps := \ $(target_notice_file_txt) \ @@ -1237,6 +1238,7 @@ deps := \ $(INSTALLED_BUILD_PROP_TARGET) \ $(ATREE_FILES) \ $(atree_dir)/sdk.atree \ + sdk/build/tools.atree \ $(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/line_endings |