diff options
| author | 2021-08-10 18:12:27 +0000 | |
|---|---|---|
| committer | 2021-08-10 18:12:27 +0000 | |
| commit | b02043b84d86fe1007afef1ff012a2155172215c (patch) | |
| tree | ec16c335f9453533b499455ed91f6f90e1c68c1f /apex/builder.go | |
| parent | d9eb0f0aa6da096cede08890b03d4c8080d4c6a9 (diff) | |
| parent | 4224c6216de1f2d9854ca9fc47927075520c33e7 (diff) | |
Merge "Improve handling of errors from zipinfo"
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/builder.go b/apex/builder.go index 148f42f09..5baa5c0cc 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}`, |