diff options
Diffstat (limited to 'android/makevars.go')
| -rw-r--r-- | android/makevars.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/makevars.go b/android/makevars.go index ece7091b6..a74185a5c 100644 --- a/android/makevars.go +++ b/android/makevars.go @@ -472,7 +472,8 @@ func (s *makeVarsSingleton) writeInstalls(installs, symlinks []katiInstall) []by fmt.Fprintf(buf, "\tchmod +x $@\n") } if extraFiles := install.extraFiles; extraFiles != nil { - fmt.Fprintf(buf, "\tunzip -qDD -d '%s' '%s'\n", extraFiles.dir.String(), extraFiles.zip.String()) + fmt.Fprintf(buf, "\t( unzip -qDD -d '%s' '%s' 2>&1 | grep -v \"zipfile is empty\"; exit $${PIPESTATUS[0]} ) || \\\n", extraFiles.dir.String(), extraFiles.zip.String()) + fmt.Fprintf(buf, "\t ( code=$$?; if [ $$code -ne 0 -a $$code -ne 1 ]; then exit $$code; fi )\n") } fmt.Fprintln(buf) } |