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

Merge "apex: add / in file_contexts as system_file" am: fae9e0cf9a

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

Change-Id: I1dab11f8feb4c61e02ddb0299fd54756de3ae10e
This commit is contained in:
Treehugger Robot
2020-07-02 04:31:07 +00:00
committed by Automerger Merge Worker
parent f9d5977467 fae9e0cf9a
commit 062e9afe7e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/builder.go
View File

@@ -255,10 +255,15 @@ func (a *apexBundle) buildFileContexts(ctx android.ModuleContext) {
output := android.PathForModuleOut(ctx, "file_contexts")
rule := android.NewRuleBuilder()
// remove old file
rule.Command().Text("rm").FlagWithOutput("-f ", output)
// copy file_contexts
rule.Command().Text("cat").Input(fileContexts).Text(">>").Output(output)
// new line
rule.Command().Text("echo").Text(">>").Output(output)
// force-label /apex_manifest.pb and / as system_file so that apexd can read them
rule.Command().Text("echo").Flag("/apex_manifest\\\\.pb u:object_r:system_file:s0").Text(">>").Output(output)
rule.Command().Text("echo").Flag("/ u:object_r:system_file:s0").Text(">>").Output(output)
rule.Build(pctx, ctx, "file_contexts."+a.Name(), "Generate file_contexts")
a.fileContexts = output.OutputPath