StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve handling of errors from zipinfo" am: b02043b84d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1790956

Change-Id: Ia5ba1e2006fba726795ae9355c8e35139f9dea93
This commit is contained in:
LaMont Jones
2021-08-10 18:25:27 +00:00
committed by Automerger Merge Worker
parent c1493b5af8 b02043b84d
commit 4b3afb7798
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/builder.go
View File

@@ -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}`,