From 5d88770f262a1b6c03b37d73a4b897f361a09200 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 4 Nov 2015 10:06:25 -0800 Subject: [PATCH] Don't run ziptime on host zip files. ziptime fails on zip file larger than 2GB. These zip files won't installed on device and we don't care that much about their reprodudcibility across builds. Change-Id: I47062928d075a59eda92dd5333e59502f490d1cb --- core/Makefile | 25 +++++++------------------ core/droiddoc.mk | 3 +-- core/tasks/cts.mk | 4 +--- core/tasks/sdk-addon.mk | 6 ++---- core/tasks/tools/package-modules.mk | 3 +-- 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/core/Makefile b/core/Makefile index 6e81784e4..5011940ca 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1132,7 +1132,7 @@ stnod: systemtarball-nodeps ## Files under out dir will be rejected to prevent possible conflicts with other rules. PDK_PLATFORM_ZIP_PRODUCT_BINARIES := $(filter-out $(OUT_DIR)/%,$(PDK_PLATFORM_ZIP_PRODUCT_BINARIES)) INSTALLED_PLATFORM_ZIP := $(PRODUCT_OUT)/platform.zip -$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES) | $(ZIPTIME) +$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES) $(call pretty,"Platform zip package: $(INSTALLED_PLATFORM_ZIP)") $(hide) rm -f $@ $(hide) cd $(dir $@) && zip -qryX $(notdir $@) \ @@ -1149,7 +1149,6 @@ endif ifneq ($(PDK_PLATFORM_ZIP_PRODUCT_BINARIES),) $(hide) zip -qryX $@ $(PDK_PLATFORM_ZIP_PRODUCT_BINARIES) endif - $(remove-timestamps-from-package) .PHONY: platform platform: $(INSTALLED_PLATFORM_ZIP) @@ -1408,7 +1407,7 @@ otatools: $(OTATOOLS) BUILT_OTATOOLS_PACKAGE := $(PRODUCT_OUT)/otatools.zip $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,otatools)/otatools -$(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP) $(ZIPTIME) +$(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP) @echo "Package OTA tools: $@" $(hide) rm -rf $@ $(zip_root) $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/system/extras/verity @@ -1420,7 +1419,6 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP) $(ZIPTIME) $(hide) (cd $(zip_root) && zip -qryX $(abspath $@) *) $(hide) zip -qryX $(abspath $@) build/target/product/security/ $(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem -o -name oem.prop | xargs zip -qryX $(abspath $@)>/dev/null || true - $(remove-timestamps-from-package) .PHONY: otatools-package otatools-package: $(BUILT_OTATOOLS_PACKAGE) @@ -1497,7 +1495,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(SELINUX_FC) \ $(APKCERTS_FILE) \ $(HOST_OUT_EXECUTABLES)/fs_config \ - | $(ACP) $(ZIPTIME) + | $(ACP) @echo "Package target files: $@" $(hide) rm -rf $@ $(zip_root) $(hide) mkdir -p $(dir $@) $(zip_root) @@ -1658,7 +1656,6 @@ endif $(hide) (cd $(zip_root) && zip -qX ../$(notdir $@) META/*filesystem_config.txt) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ ./build/tools/releasetools/add_img_to_target_files -v -p $(HOST_OUT) $@ - $(remove-timestamps-from-package) .PHONY: target-files-package target-files-package: $(BUILT_TARGET_FILES_PACKAGE) @@ -1732,12 +1729,11 @@ SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip ifndef TARGET_BUILD_APPS $(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_BOOTIMAGE_TARGET) endif -$(SYMBOLS_ZIP): | $(ZIPTIME) +$(SYMBOLS_ZIP): @echo "Package symbols: $@" $(hide) rm -rf $@ $(hide) mkdir -p $(dir $@) $(TARGET_OUT_UNSTRIPPED) $(hide) zip -qrX $@ $(TARGET_OUT_UNSTRIPPED) - $(remove-timestamps-from-package) # ----------------------------------------------------------------- # A zip of the Android Apps. Not keeping full path so that we don't @@ -1750,7 +1746,7 @@ endif name := $(name)-apps-$(FILE_NAME_TAG) APPS_ZIP := $(PRODUCT_OUT)/$(name).zip -$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE) | $(ZIPTIME) +$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE) @echo "Package apps: $@" $(hide) rm -rf $@ $(hide) mkdir -p $(dir $@) @@ -1761,7 +1757,6 @@ $(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE) | $(ZIPTIME) else \ zip -qjX $@ $$apps_to_zip; \ fi - $(remove-timestamps-from-package) #------------------------------------------------------------------ # A zip of emma code coverage meta files. Generated for fully emma @@ -1770,12 +1765,10 @@ $(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE) | $(ZIPTIME) ifeq (true,$(EMMA_INSTRUMENT)) EMMA_META_ZIP := $(PRODUCT_OUT)/emma_meta.zip # the dependency will be set up later in build/core/main.mk. -$(EMMA_META_ZIP): | $(ZIPTIME) $(EMMA_META_ZIP) : @echo "Collecting Emma coverage meta files." $(hide) find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "coverage.em" | \ zip -@ -qX $@ - $(remove-timestamps-from-package) endif # EMMA_INSTRUMENT=true @@ -1786,7 +1779,6 @@ endif # EMMA_INSTRUMENT=true ifdef TARGET_BUILD_APPS PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip # the dependency will be set up later in build/core/main.mk. -$(PROGUARD_DICT_ZIP): | $(ZIPTIME) $(PROGUARD_DICT_ZIP) : @echo "Packaging Proguard obfuscation dictionary files." $(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \ @@ -1799,7 +1791,6 @@ $(PROGUARD_DICT_ZIP) : zip -qd $@ zipdummy; \ rm $(dir $@)/zipdummy; \ fi - $(remove-timestamps-from-package) endif # TARGET_BUILD_APPS @@ -1822,10 +1813,9 @@ name := $(TARGET_PRODUCT)-emulator-$(FILE_NAME_TAG) INTERNAL_EMULATOR_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip -$(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) | $(ZIPTIME) +$(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) @echo "Package: $@" $(hide) zip -qjX $@ $(INTERNAL_EMULATOR_PACKAGE_FILES) - $(remove-timestamps-from-package) endif # ----------------------------------------------------------------- @@ -1925,7 +1915,7 @@ $(INTERNAL_SDK_TARGET): PRIVATE_INPUT_FILES := $(sdk_atree_files) # #SDK_GNU_ERROR := true -$(INTERNAL_SDK_TARGET): $(deps) | $(ZIPTIME) +$(INTERNAL_SDK_TARGET): $(deps) @echo "Package SDK: $@" $(hide) rm -rf $(PRIVATE_DIR) $@ $(hide) for f in $(target_gnu_MODULES); do \ @@ -1962,7 +1952,6 @@ $(INTERNAL_SDK_TARGET): $(deps) | $(ZIPTIME) chmod -R ug+rwX $(PRIVATE_DIR) && \ cd $(dir $@) && zip -rqX $(notdir $@) $(PRIVATE_NAME) \ ) || ( rm -rf $(PRIVATE_DIR) $@ && exit 44 ) - $(remove-timestamps-from-package) # Is a Windows SDK requested? If so, we need some definitions from here diff --git a/core/droiddoc.mk b/core/droiddoc.mk index c0a27326e..74f7d8b74 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -237,12 +237,11 @@ ifeq ($(strip $(LOCAL_UNINSTALLABLE_MODULE)),) # Define a rule to create a zip of these docs. out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip $(out_zip): PRIVATE_DOCS_DIR := $(out_dir) -$(out_zip): $(full_target) | $(ZIPTIME) +$(out_zip): $(full_target) @echo Package docs: $@ @rm -f $@ @mkdir -p $(dir $@) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_DOCS_DIR) && zip -rqX $$F * ) - $(remove-timestamps-from-package) $(LOCAL_MODULE)-docs.zip : $(out_zip) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 2050fc732..6288ce801 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -385,12 +385,10 @@ $(INTERNAL_CTS_TARGET): PRIVATE_NAME := $(cts_name) $(INTERNAL_CTS_TARGET): PRIVATE_CTS_DIR := $(cts_dir) $(INTERNAL_CTS_TARGET): PRIVATE_DIR := $(cts_dir)/$(cts_name) $(INTERNAL_CTS_TARGET): TMP_DIR := $(cts_dir)/temp -$(INTERNAL_CTS_TARGET): $(cts_dir)/all_cts_files_stamp $(DEFAULT_TEST_PLAN) | $(ZIPTIME) +$(INTERNAL_CTS_TARGET): $(cts_dir)/all_cts_files_stamp $(DEFAULT_TEST_PLAN) $(hide) echo "Package CTS: $@" $(hide) cd $(dir $@) && zip -rqX $(notdir $@) $(PRIVATE_NAME) - $(remove-timestamps-from-package) .PHONY: cts cts: $(INTERNAL_CTS_TARGET) adb $(call dist-for-goals,cts,$(INTERNAL_CTS_TARGET)) - diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 0062f7e9a..362b22935 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -104,7 +104,7 @@ $(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules)) $(full_target): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_leaf)) -$(full_target): $(sdk_addon_deps) | $(ACP) $(ZIPTIME) +$(full_target): $(sdk_addon_deps) | $(ACP) @echo Packaging SDK Addon: $@ $(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs $(hide) for d in $(PRIVATE_DOCS_DIRS); do \ @@ -112,14 +112,12 @@ $(full_target): $(sdk_addon_deps) | $(ACP) $(ZIPTIME) done $(hide) mkdir -p $(dir $@) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) ) - $(remove-timestamps-from-package) $(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI) -$(full_target_img): $(full_target) $(addon_img_source_prop) | $(ZIPTIME) +$(full_target_img): $(full_target) $(addon_img_source_prop) @echo Packaging SDK Addon System-Image: $@ $(hide) mkdir -p $(dir $@) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) ) - $(remove-timestamps-from-package) .PHONY: sdk_addon diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk index 2e1ad21b5..24a7608b2 100644 --- a/core/tasks/tools/package-modules.mk +++ b/core/tasks/tools/package-modules.mk @@ -47,7 +47,7 @@ endef my_package_zip := $(my_staging_dir)/$(my_package_name).zip $(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs) $(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files) -$(my_package_zip) : $(my_built_modules) | $(ZIPTIME) +$(my_package_zip) : $(my_built_modules) @echo "Package $@" @rm -rf $(dir $@) && mkdir -p $(dir $@) $(call copy-tests-in-batch,$(wordlist 1,200,$(PRIVATE_COPY_PAIRS))) @@ -60,4 +60,3 @@ $(my_package_zip) : $(my_built_modules) | $(ZIPTIME) $(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\ cp -RfL $(f) $(dir $@);) $(hide) cd $(dir $@) && zip -rqX $(notdir $@) * - $(remove-timestamps-from-package)