openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove SDK Tools from platform builds."

This commit is contained in:
Xavier Ducrohet 2014-05-09 00:46:44 +00:00 committed by Gerrit Code Review
parent 0d4b3df6aa 51e303a281
commit afe444a564
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/Makefile
View File

@ -1491,27 +1491,11 @@ endif
atree_dir := development/build 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 := \ sdk_atree_files := \
$(atree_dir)/sdk.exclude.atree \ $(atree_dir)/sdk.exclude.atree \
$(atree_dir)/sdk.atree \ $(atree_dir)/sdk.atree \
$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \ $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree
$(sdk_tools_atree_files)
# development/build/sdk-android-<abi>.atree is used to differentiate # development/build/sdk-android-<abi>.atree is used to differentiate
# between architecture models (e.g. ARMv5TE versus ARMv7) when copying # between architecture models (e.g. ARMv5TE versus ARMv7) when copying
@ -1533,7 +1517,6 @@ deps := \
$(INSTALLED_BUILD_PROP_TARGET) \ $(INSTALLED_BUILD_PROP_TARGET) \
$(ATREE_FILES) \ $(ATREE_FILES) \
$(atree_dir)/sdk.atree \ $(atree_dir)/sdk.atree \
$(sdk_tools_atree_files) \
$(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/atree \
$(HOST_OUT_EXECUTABLES)/line_endings $(HOST_OUT_EXECUTABLES)/line_endings
@ -1576,7 +1559,6 @@ $(INTERNAL_SDK_TARGET): $(deps)
-o $(PRIVATE_DIR) && \ -o $(PRIVATE_DIR) && \
cp -f $(target_notice_file_txt) \ cp -f $(target_notice_file_txt) \
$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.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 && \ cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/platform-tools/NOTICE.txt && \
HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \ HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \
development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \ development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \

16
target/product/emulator.mk
View File

@ -20,21 +20,7 @@
# Host modules # Host modules
PRODUCT_PACKAGES += \ 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 # Device modules
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \