From 4224c6216de1f2d9854ca9fc47927075520c33e7 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Thu, 5 Aug 2021 20:59:17 +0000 Subject: [PATCH] Improve handling of errors from zipinfo Bug: 153900481 Test: manual Change-Id: Ib60578ead4ccaa7ba09f628a6c9281c0cc70e6ce --- apex/builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/builder.go b/apex/builder.go index 24c049bcd..af79407a4 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -75,7 +75,7 @@ var ( // by default set to (uid/gid/mode) = (1000/1000/0644) // TODO(b/113082813) make this configurable using config.fs syntax generateFsConfig = pctx.StaticRule("generateFsConfig", blueprint.RuleParams{ - Command: `( echo '/ 1000 1000 0755' ` + + Command: `( set -e; echo '/ 1000 1000 0755' ` + `&& for i in ${ro_paths}; do echo "/$$i 1000 1000 0644"; done ` + `&& for i in ${exec_paths}; do echo "/$$i 0 2000 0755"; done ` + `&& ( tr ' ' '\n' <${out}.apklist | for i in ${apk_paths}; do read apk; echo "/$$i 0 2000 0755"; zipinfo -1 $$apk | sed "s:\(.*\):/$$i/\1 1000 1000 0644:"; done ) ) > ${out}`,