StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

definitions.mk: Detect bad zip files.

Browse Source 
If the jar file passed to add-jar-resources-to-package is passed a
non-zipfile, then we should produce an error.

Bug: 153900481
Test: manual
Change-Id: Idc4dd9afd89eaee08a9e792dfa2a759e64b783fc
This commit is contained in:
LaMont Jones
2021-08-06 14:02:34 +00:00
parent 37e6196c4e
commit e1af00ba56
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/definitions.mk
View File

@@ -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