Rename aconfig namespace to package.
Bug: 285303012
Test: for x in next trunk trunk_food trunk_staging ; do lunch aosp_panther-$x-eng ; m nothing ; done
Change-Id: I9ee3b1f0207b828557d339d7f50cad77ff16310f
diff --git a/device_config/device_config_value_set.go b/device_config/device_config_value_set.go
index e406d20..b354305 100644
--- a/device_config/device_config_value_set.go
+++ b/device_config/device_config_value_set.go
@@ -51,9 +51,9 @@
// Provider published by device_config_value_set
type valueSetProviderData struct {
- // The namespace of each of the
- // (map of namespace --> device_config_module)
- AvailableNamespaces map[string]android.Paths
+ // The package of each of the
+ // (map of package --> device_config_module)
+ AvailablePackages map[string]android.Paths
}
var valueSetProviderKey = blueprint.NewProvider(valueSetProviderData{})
@@ -70,10 +70,10 @@
}
func (module *ValueSetModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
- // Accumulate the namespaces of the values modules listed, and set that as an
+ // Accumulate the packages of the values modules listed, and set that as an
// valueSetProviderKey provider that device_config modules can read and use
// to append values to their aconfig actions.
- namespaces := make(map[string]android.Paths)
+ packages := make(map[string]android.Paths)
ctx.VisitDirectDeps(func(dep android.Module) {
if !ctx.OtherModuleHasProvider(dep, valuesProviderKey) {
// Other modules get injected as dependencies too, for example the license modules
@@ -83,10 +83,10 @@
srcs := make([]android.Path, len(depData.Values))
copy(srcs, depData.Values)
- namespaces[depData.Namespace] = srcs
+ packages[depData.Package] = srcs
})
ctx.SetProvider(valueSetProviderKey, valueSetProviderData{
- AvailableNamespaces: namespaces,
+ AvailablePackages: packages,
})
}