Merge "Remove changing uids/timestamps from zip/jar files" am: a0975edc16

am: c789be850c

* commit 'c789be850ca14b945e72412457991d7a5e13126e':
  Remove changing uids/timestamps from zip/jar files
This commit is contained in:
Dan Willemsen
2015-11-03 23:43:30 +00:00
committed by android-build-merger
15 changed files with 752 additions and 40 deletions

View File

@@ -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)
$(my_package_zip) : $(my_built_modules) | $(ZIPTIME)
@echo "Package $@"
@rm -rf $(dir $@) && mkdir -p $(dir $@)
$(call copy-tests-in-batch,$(wordlist 1,200,$(PRIVATE_COPY_PAIRS)))
@@ -59,4 +59,5 @@ $(my_package_zip) : $(my_built_modules)
$(call copy-tests-in-batch,$(wordlist 1201,9999,$(PRIVATE_COPY_PAIRS)))
$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\
cp -RfL $(f) $(dir $@);)
$(hide) cd $(dir $@) && zip -rq $(notdir $@) *
$(hide) cd $(dir $@) && zip -rqX $(notdir $@) *
$(remove-timestamps-from-package)