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_definitions.go b/device_config/device_config_definitions.go
index ab2e4f7..97f5dca 100644
--- a/device_config/device_config_definitions.go
+++ b/device_config/device_config_definitions.go
@@ -30,8 +30,8 @@
// aconfig files, relative to this Android.bp file
Srcs []string `android:"path"`
- // Release config flag namespace
- Namespace string
+ // Release config flag package
+ Package string
// Values from TARGET_RELEASE / RELEASE_DEVICE_CONFIG_VALUE_SETS
Values []string `blueprint:"mutated"`
@@ -64,13 +64,13 @@
ctx.PropertyErrorf("srcs", "missing source files")
return
}
- if len(module.properties.Namespace) == 0 {
- ctx.PropertyErrorf("namespace", "missing namespace property")
+ if len(module.properties.Package) == 0 {
+ ctx.PropertyErrorf("package", "missing package property")
}
// Add a dependency on the device_config_value_sets defined in
// RELEASE_DEVICE_CONFIG_VALUE_SETS, and add any device_config_values that
- // match our namespace.
+ // match our package.
valuesFromConfig := ctx.Config().ReleaseDeviceConfigValueSets()
ctx.AddDependency(ctx.Module(), implicitValuesTag, valuesFromConfig...)
}
@@ -98,8 +98,8 @@
// Provider published by device_config_value_set
type definitionsProviderData struct {
- namespace string
- intermediatePath android.WritablePath
+ Package string
+ IntermediatePath android.WritablePath
}
var definitionsProviderKey = blueprint.NewProvider(definitionsProviderData{})
@@ -112,7 +112,7 @@
return
}
depData := ctx.OtherModuleProvider(dep, valueSetProviderKey).(valueSetProviderData)
- valuesFiles, ok := depData.AvailableNamespaces[module.properties.Namespace]
+ valuesFiles, ok := depData.AvailablePackages[module.properties.Package]
if ok {
for _, path := range valuesFiles {
module.properties.Values = append(module.properties.Values, path.String())
@@ -130,14 +130,14 @@
Description: "device_config_definitions",
Args: map[string]string{
"release_version": ctx.Config().ReleaseVersion(),
- "namespace": module.properties.Namespace,
+ "package": module.properties.Package,
"values": joinAndPrefix(" --values ", module.properties.Values),
},
})
ctx.SetProvider(definitionsProviderKey, definitionsProviderData{
- namespace: module.properties.Namespace,
- intermediatePath: intermediatePath,
+ Package: module.properties.Package,
+ IntermediatePath: intermediatePath,
})
}