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

Merge "Materialize the copy commands of an APEX rule as a Ninja response file."

Browse Source
This commit is contained in:
Roland Levillain
2019-08-01 13:51:22 +00:00
committed by Gerrit Code Review
parent 395ab52ee9 96cf4d4646
commit ec5fc70856
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/apex.go
View File

@@ -52,7 +52,7 @@ var (
// TODO(b/114327326): automate the generation of file_contexts // TODO(b/114327326): automate the generation of file_contexts
apexRule = pctx.StaticRule("apexRule", blueprint.RuleParams{ apexRule = pctx.StaticRule("apexRule", blueprint.RuleParams{
Command: `rm -rf ${image_dir} && mkdir -p ${image_dir} && ` + Command: `rm -rf ${image_dir} && mkdir -p ${image_dir} && ` +
`(${copy_commands}) && ` + `(. ${out}.copy_commands) && ` +
`APEXER_TOOL_PATH=${tool_path} ` + `APEXER_TOOL_PATH=${tool_path} ` +
`${apexer} --force --manifest ${manifest} ` + `${apexer} --force --manifest ${manifest} ` +
`--file_contexts ${file_contexts} ` + `--file_contexts ${file_contexts} ` +
@@ -62,17 +62,21 @@ var (
CommandDeps: []string{"${apexer}", "${avbtool}", "${e2fsdroid}", "${merge_zips}", CommandDeps: []string{"${apexer}", "${avbtool}", "${e2fsdroid}", "${merge_zips}",
"${mke2fs}", "${resize2fs}", "${sefcontext_compile}", "${mke2fs}", "${resize2fs}", "${sefcontext_compile}",
"${soong_zip}", "${zipalign}", "${aapt2}", "prebuilts/sdk/current/public/android.jar"}, "${soong_zip}", "${zipalign}", "${aapt2}", "prebuilts/sdk/current/public/android.jar"},
Rspfile: "${out}.copy_commands",
RspfileContent: "${copy_commands}",
Description: "APEX ${image_dir} => ${out}", Description: "APEX ${image_dir} => ${out}",
}, "tool_path", "image_dir", "copy_commands", "manifest", "file_contexts", "canned_fs_config", "key", "opt_flags") }, "tool_path", "image_dir", "copy_commands", "manifest", "file_contexts", "canned_fs_config", "key", "opt_flags")
zipApexRule = pctx.StaticRule("zipApexRule", blueprint.RuleParams{ zipApexRule = pctx.StaticRule("zipApexRule", blueprint.RuleParams{
Command: `rm -rf ${image_dir} && mkdir -p ${image_dir} && ` + Command: `rm -rf ${image_dir} && mkdir -p ${image_dir} && ` +
`(${copy_commands}) && ` + `(. ${out}.copy_commands) && ` +
`APEXER_TOOL_PATH=${tool_path} ` + `APEXER_TOOL_PATH=${tool_path} ` +
`${apexer} --force --manifest ${manifest} ` + `${apexer} --force --manifest ${manifest} ` +
`--payload_type zip ` + `--payload_type zip ` +
`${image_dir} ${out} `, `${image_dir} ${out} `,
CommandDeps: []string{"${apexer}", "${merge_zips}", "${soong_zip}", "${zipalign}", "${aapt2}"}, CommandDeps: []string{"${apexer}", "${merge_zips}", "${soong_zip}", "${zipalign}", "${aapt2}"},
Rspfile: "${out}.copy_commands",
RspfileContent: "${copy_commands}",
Description: "ZipAPEX ${image_dir} => ${out}", Description: "ZipAPEX ${image_dir} => ${out}",
}, "tool_path", "image_dir", "copy_commands", "manifest") }, "tool_path", "image_dir", "copy_commands", "manifest")