Merge "definitions.mk: Detect bad zip files." am: a21e1db314
am: ededf6b49e
Original change: https://android-review.googlesource.com/c/platform/build/+/1791227 Change-Id: I29f819a68dc34b6bd08092a9357a5adc53b0e686
This commit is contained in:
@@ -2329,6 +2329,7 @@ endef
|
|||||||
define add-jar-resources-to-package
|
define add-jar-resources-to-package
|
||||||
rm -rf $(3)
|
rm -rf $(3)
|
||||||
mkdir -p $(3)
|
mkdir -p $(3)
|
||||||
|
zipinfo -1 $(2) > /dev/null
|
||||||
unzip -qo $(2) -d $(3) $$(zipinfo -1 $(2) | grep -v -E "\.class$$")
|
unzip -qo $(2) -d $(3) $$(zipinfo -1 $(2) | grep -v -E "\.class$$")
|
||||||
$(JAR) uf $(1) $(call jar-args-sorted-files-in-directory,$(3))
|
$(JAR) uf $(1) $(call jar-args-sorted-files-in-directory,$(3))
|
||||||
endef
|
endef
|
||||||
|
Reference in New Issue
Block a user