Merge "definitions.mk: Detect bad zip files." am: a21e1db314

Original change: https://android-review.googlesource.com/c/platform/build/+/1791227 Change-Id: I327a59a087ca92249cd368b4dc832e7bf9973bc5
2021-08-10 17:03:08 +00:00
parent 9d58e7d2a7 a21e1db314
commit ededf6b49e
1 changed files with 1 additions and 0 deletions
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2329,6 +2329,7 @@ endef
 define add-jar-resources-to-package
  rm -rf $(3)
  mkdir -p $(3)
+  zipinfo -1 $(2) > /dev/null
  unzip -qo $(2) -d $(3) $$(zipinfo -1 $(2) | grep -v -E "\.class$$")
  $(JAR) uf $(1) $(call jar-args-sorted-files-in-directory,$(3))
 endef