Cleanup configurable getter usages
You don't have to call module.ConfigurableEvaluator(ctx) if ctx is
already a ModuleContext, you only need to do that for more restricted
contexts like SingletonContext.
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I7612290d43dae7decfae283a341882d9016c98a3
diff --git a/apex/builder.go b/apex/builder.go
index 6f645ab..bfe1692 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -704,7 +704,7 @@
optFlags = append(optFlags, "--override_apk_package_name "+manifestPackageName)
}
- androidManifest := a.properties.AndroidManifest.GetOrDefault(a.ConfigurableEvaluator(ctx), "")
+ androidManifest := a.properties.AndroidManifest.GetOrDefault(ctx, "")
if androidManifest != "" {
androidManifestFile := android.PathForModuleSrc(ctx, androidManifest)
@@ -1196,7 +1196,7 @@
}
// Custom fs_config is "appended" to the last so that entries from the file are preferred
// over default ones set above.
- customFsConfig := a.properties.Canned_fs_config.GetOrDefault(a.ConfigurableEvaluator(ctx), "")
+ customFsConfig := a.properties.Canned_fs_config.GetOrDefault(ctx, "")
if customFsConfig != "" {
cmd.Text("cat").Input(android.PathForModuleSrc(ctx, customFsConfig))
}