diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-05-08 17:45:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-08 17:45:14 +0000 |
| commit | aa0900c16f5a97405eb800b1686cbd010b7d479e (patch) | |
| tree | 2d951d4bdf9b97bf5217cae62b76c3e48ce34ded | |
| parent | 6c3d75cd5c86b3770c7a5e10eb9b2e7affdddba5 (diff) | |
| parent | edf30221b4890673dc714a1efef3b5faf4ae1522 (diff) | |
| download | build-idea133.tar.gz | |
Merge "Remove SDK Tools from platform builds." into idea133idea133
| -rw-r--r-- | core/Makefile | 20 | ||||
| -rw-r--r-- | target/product/emulator.mk | 30 |
2 files changed, 16 insertions, 34 deletions
diff --git a/core/Makefile b/core/Makefile index 918a94f214..99a6554b2a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1544,27 +1544,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 @@ -1586,7 +1570,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 @@ -1629,7 +1612,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 d0a0b7a7a4..2746616c3f 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -27,21 +27,21 @@ $(warning ######### emulator-64 temporarily deactivated for $(HOST_OS) ########) # 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 +# 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 += \ |