commit 1cef6294594a90165ba7f5dadc3374f6b33e032e
author Romain Jobredeaux <jobredeaux@google.com> Thu May 19 11:11:51 2022 -0400
committer Romain Jobredeaux <jobredeaux@google.com> Thu May 19 14:50:27 2022 -0400
tree 1f6f576076d4ad9268e06b08b80b742bac091d7b
parent be4c7eda0863bb79f3fe0dc9b6b0cd9c2b33185b

Allow empty zip file in extra files in install command.

Test: m
Bug: 229901709
Change-Id: I4c8d1b16f2232d4cda75467615779145d2c7315e

android/module.go

diff --git a/android/module.go b/android/module.go
index ab68e24..7285a2f 100644
--- a/android/module.go
+++ b/android/module.go
@@ -3208,8 +3208,9 @@
 
 			extraCmds := ""
 			if extraZip != nil {
-				extraCmds += fmt.Sprintf(" && unzip -qDD -d '%s' '%s'",
+				extraCmds += fmt.Sprintf(" && ( unzip -qDD -d '%s' '%s' 2>&1 | grep -v \"zipfile is empty\"; exit $${PIPESTATUS[0]} )",
 					extraZip.dir.String(), extraZip.zip.String())
+				extraCmds += " || ( code=$$?; if [ $$code -ne 0 -a $$code -ne 1 ]; then exit $$code; fi )"
 				implicitDeps = append(implicitDeps, extraZip.zip)
 			}