diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-05-09 00:46:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-09 00:46:45 +0000 |
| commit | afe444a564ed72cdda792822a0c9dab57a8c9172 (patch) | |
| tree | c404c2f15df1bf95ff6c8bdee7114b1f0e0a10e2 | |
| parent | 0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667 (diff) | |
| parent | 51e303a2812aca4db4c708f845e30dfbdfbe0423 (diff) | |
| download | build-afe444a564ed72cdda792822a0c9dab57a8c9172.zip build-afe444a564ed72cdda792822a0c9dab57a8c9172.tar.gz build-afe444a564ed72cdda792822a0c9dab57a8c9172.tar.bz2 | |
Merge "Remove SDK Tools from platform builds."
| -rw-r--r-- | core/Makefile | 20 | ||||
| -rw-r--r-- | target/product/emulator.mk | 16 |
2 files changed, 2 insertions, 34 deletions
diff --git a/core/Makefile b/core/Makefile index b6e0057..471dcb4 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1491,27 +1491,11 @@ 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.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 @@ -1533,7 +1517,6 @@ deps := \ $(INSTALLED_BUILD_PROP_TARGET) \ $(ATREE_FILES) \ $(atree_dir)/sdk.atree \ - $(sdk_tools_atree_files) \ $(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/line_endings @@ -1576,7 +1559,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) && \ diff --git a/target/product/emulator.mk b/target/product/emulator.mk index c094a92..62099df 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -20,21 +20,7 @@ # Host modules PRODUCT_PACKAGES += \ - emulator \ - emulator-x86 \ - emulator-arm \ - emulator-mips \ - emulator64-x86 \ - emulator64-arm \ - emulator64-mips \ - libOpenglRender \ - libGLES_CM_translator \ - libGLES_V2_translator \ - libEGL_translator \ - lib64OpenglRender \ - lib64GLES_CM_translator \ - lib64GLES_V2_translator \ - lib64EGL_translator + # Device modules PRODUCT_PACKAGES += \ |