Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bbc2d02 authored by LaMont Jones's avatar LaMont Jones Committed by Automerger Merge Worker
Browse files

Merge "Improve handling of errors from zipinfo" am: b02043b8 am: 4b3afb77 

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

Change-Id: Ibe3bd86d8c2163ff873794be96a25827874b5e29
parents f54a01bd 4b3afb77

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -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}`,