commit b589ae4e2661d42cbdc0a44193e2df384424e483
author Dan Willemsen <dwillemsen@google.com> Thu Oct 29 21:26:18 2015 +0000
committer Dan Willemsen <dwillemsen@google.com> Thu Oct 29 21:26:18 2015 +0000
tree c68117852ef20dd818551aaac1834c5dc9321acb
parent 3c2c064c8791ed2d4b9d6780d7b87f406ab78f10

Revert "Remove changing uids/timestamps from zip/jar files"

This reverts commit 3c2c064c8791ed2d4b9d6780d7b87f406ab78f10.

zipalign depends on libandroidfw, and some setups don't include frameworks/base.

Bug: 24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f

core/tasks/cts.mk

diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 38f1301..56a7f6f 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -387,7 +387,7 @@
 $(INTERNAL_CTS_TARGET): TMP_DIR := $(cts_dir)/temp
 $(INTERNAL_CTS_TARGET): $(cts_dir)/all_cts_files_stamp $(DEFAULT_TEST_PLAN)
 	$(hide) echo "Package CTS: $@"
-	$(hide) cd $(dir $@) && zip -rqX $(notdir $@) $(PRIVATE_NAME)
+	$(hide) cd $(dir $@) && zip -rq $(notdir $@) $(PRIVATE_NAME)
 
 .PHONY: cts
 cts: $(INTERNAL_CTS_TARGET) adb