From e1af00ba5644828618621008c0207cedcc48efb5 Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamontjones@google.com>
Date: Fri, 6 Aug 2021 14:02:34 +0000
Subject: [PATCH] definitions.mk: Detect bad zip files.

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
---
 core/definitions.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/definitions.mk b/core/definitions.mk
index 0fd023abf5..981c6cb3b8 100644
--- 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