Remove apex.use_file_contexts_as_is
It was a workaround to build a vendor apex which needs to read
apex_manifest and run on SDK 34, which doesn't have
vendor_apex_metadata_file yet.
Vendor_apex_metadata_file is available since SDK 35, we can remove
the workaround.
Bug: 388964457
Test: m --no-skip-soong-tests
Change-Id: Iad91bee7c689c96322e342485301152739baa92a
diff --git a/apex/apex.go b/apex/apex.go
index d39a17f..3d8baa6 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -83,10 +83,6 @@
// /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 d9348c5..641aa27 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -426,8 +426,6 @@
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)
@@ -444,11 +442,9 @@
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