p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove system partition files from the test zip file."

This commit is contained in:
Ying Wang 2012-03-13 13:00:46 -07:00 committed by Android (Google) Code Review
parent 49932f1edb c5f049799c
commit bdbbd2062c
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/Makefile
View File

@ -1206,7 +1206,7 @@ endif # TARGET_PRODUCT != sdk
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# A zip of the tests that are built when running "make tests". # A zip of the tests that are built when running "make tests".
# This is very similar to BUILT_TARGET_FILES_PACKAGE, but we # This is very similar to BUILT_TARGET_FILES_PACKAGE, but we
# only grab SYSTEM and DATA, and it's called "*-tests-*.zip". # only grab DATA, and it's called "*-tests-*.zip".
# #
name := $(TARGET_PRODUCT) name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug) ifeq ($(TARGET_BUILD_TYPE),debug)
@ -1222,21 +1222,11 @@ $(BUILT_TESTS_ZIP_PACKAGE): zip_root := $(intermediates)/$(name)
# Depending on the images guarantees that the underlying # Depending on the images guarantees that the underlying
# directories are up-to-date. # directories are up-to-date.
$(BUILT_TESTS_ZIP_PACKAGE): \ $(BUILT_TESTS_ZIP_PACKAGE): \
$(BUILT_SYSTEMIMAGE) \
$(INSTALLED_USERDATAIMAGE_TARGET) \ $(INSTALLED_USERDATAIMAGE_TARGET) \
| $(ACP) | $(ACP)
@echo "Package test files: $@" @echo "Package test files: $@"
$(hide) rm -rf $@ $(zip_root) $(hide) rm -rf $@ $(zip_root)
$(hide) mkdir -p $(dir $@) $(zip_root) $(hide) mkdir -p $(dir $@) $(zip_root)
@# Some parts of the system image
$(hide) $(call package_files-copy-root, \
$(SYSTEMIMAGE_SOURCE_DIR)/xbin,$(zip_root)/SYSTEM/xbin)
$(hide) $(call package_files-copy-root, \
$(SYSTEMIMAGE_SOURCE_DIR)/lib,$(zip_root)/SYSTEM/lib)
$(hide) $(call package_files-copy-root, \
$(SYSTEMIMAGE_SOURCE_DIR)/framework, \
$(zip_root)/SYSTEM/framework)
$(hide) $(ACP) $(SYSTEMIMAGE_SOURCE_DIR)/build.prop $(zip_root)/SYSTEM
@# Contents of the data image @# Contents of the data image
$(hide) $(call package_files-copy-root, \ $(hide) $(call package_files-copy-root, \
$(TARGET_OUT_DATA),$(zip_root)/DATA) $(TARGET_OUT_DATA),$(zip_root)/DATA)