diff options
| author | 2025-02-23 21:48:41 -0800 | |
|---|---|---|
| committer | 2025-02-23 21:48:41 -0800 | |
| commit | a88b86ff5d86306ec15bc1de7892d17b4154210e (patch) | |
| tree | e15967f4ece66c997b8b5302004c6c3a28386536 | |
| parent | 324d19b8b5a20678586d4e8e4b894a2bba70a2ae (diff) | |
| parent | dfec67cc5df28ba4a1e0a9e76bcc1f5d0b07fc4e (diff) | |
Merge "Remove apex.use_file_contexts_as_is" into main
| -rw-r--r-- | apex/apex.go | 4 | ||||
| -rw-r--r-- | apex/builder.go | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/apex/apex.go b/apex/apex.go index 4b510f8f1..6e4685b1f 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -82,10 +82,6 @@ type apexBundleProperties struct { // /system/sepolicy/apex/<module_name>_file_contexts. File_contexts *string `android:"path"` - // By default, file_contexts is amended by force-labelling / and /apex_manifest.pb as system_file - // to avoid mistakes. When set as true, no force-labelling. - Use_file_contexts_as_is *bool - // Path to the canned fs config file for customizing file's // uid/gid/mod/capabilities. The content of this file is appended to the // default config, so that the custom entries are preferred. The format is diff --git a/apex/builder.go b/apex/builder.go index 842771920..15737f8c7 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -428,8 +428,6 @@ func (a *apexBundle) buildFileContexts(ctx android.ModuleContext) android.Path { ctx.PropertyErrorf("file_contexts", "cannot find file_contexts file: %q", fileContexts.String()) } - useFileContextsAsIs := proptools.Bool(a.properties.Use_file_contexts_as_is) - output := android.PathForModuleOut(ctx, "file_contexts") rule := android.NewRuleBuilder(pctx, ctx) @@ -446,11 +444,9 @@ func (a *apexBundle) buildFileContexts(ctx android.ModuleContext) android.Path { rule.Command().Text("cat").Input(fileContexts).Text(">>").Output(output) // new line rule.Command().Text("echo").Text(">>").Output(output) - if !useFileContextsAsIs { - // force-label /apex_manifest.pb and / - rule.Command().Text("echo").Text("/apex_manifest\\\\.pb").Text(labelForManifest).Text(">>").Output(output) - rule.Command().Text("echo").Text("/").Text(labelForRoot).Text(">>").Output(output) - } + // force-label /apex_manifest.pb and / + rule.Command().Text("echo").Text("/apex_manifest\\\\.pb").Text(labelForManifest).Text(">>").Output(output) + rule.Command().Text("echo").Text("/").Text(labelForRoot).Text(">>").Output(output) rule.Build("file_contexts."+a.Name(), "Generate file_contexts") return output |