diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-05-09 02:13:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 02:13:32 +0000 |
| commit | 7b967dc13fa59a99c00d9b7f0c457b867ef1397f (patch) | |
| tree | 76c464a7db9a900bb50304cbb498322fd6347f51 /core | |
| parent | c921b1eb198a3da1fd8a1d6a378aa9b1d4d3b980 (diff) | |
| parent | a6a2969e020ea16edbe24661d2b63f7f2bdf98b6 (diff) | |
| download | build-7b967dc13fa59a99c00d9b7f0c457b867ef1397f.zip build-7b967dc13fa59a99c00d9b7f0c457b867ef1397f.tar.gz build-7b967dc13fa59a99c00d9b7f0c457b867ef1397f.tar.bz2 | |
am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
Remove SDK Tools from platform builds.
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/core/Makefile b/core/Makefile index e7889a2..83a9684 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1541,26 +1541,10 @@ 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 -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 \ - $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \ - $(sdk_tools_atree_files) + $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree # development/build/sdk-android-<abi>.atree is used to differentiate # between architecture models (e.g. ARMv5TE versus ARMv7) when copying @@ -1588,7 +1572,6 @@ deps := \ $(INSTALLED_BUILD_PROP_TARGET) \ $(ATREE_FILES) \ $(sdk_atree_files) \ - $(sdk_tools_atree_files) \ $(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/line_endings @@ -1631,7 +1614,6 @@ $(INTERNAL_SDK_TARGET): $(deps) -o $(PRIVATE_DIR) && \ cp -f $(target_notice_file_txt) \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ - cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \ cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/platform-tools/NOTICE.txt && \ HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \ development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \ |