diff options
| -rw-r--r-- | aconfig/aconfig_declarations.go | 7 | ||||
| -rw-r--r-- | aconfig/codegen/java_aconfig_library_test.go | 2 | ||||
| -rw-r--r-- | android/aconfig_providers.go | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go index 9a9e5686a..e38396d92 100644 --- a/aconfig/aconfig_declarations.go +++ b/aconfig/aconfig_declarations.go @@ -88,13 +88,6 @@ func (module *DeclarationsModule) DepsMutator(ctx android.BottomUpMutatorContext ctx.PropertyErrorf("container", "missing container property") } - // treating system_ext as system partition as we are combining them as one container - // TODO remove this logic once we start enforcing that system_ext cannot be specified as - // container in the container field. - if module.properties.Container == "system_ext" { - module.properties.Container = "system" - } - // Add a dependency on the aconfig_value_sets defined in // RELEASE_ACONFIG_VALUE_SETS, and add any aconfig_values that // match our package. diff --git a/aconfig/codegen/java_aconfig_library_test.go b/aconfig/codegen/java_aconfig_library_test.go index 8854369e2..b9455f77d 100644 --- a/aconfig/codegen/java_aconfig_library_test.go +++ b/aconfig/codegen/java_aconfig_library_test.go @@ -260,7 +260,7 @@ func TestMkEntriesMatchedContainer(t *testing.T) { aconfig_declarations { name: "my_aconfig_declarations_bar", package: "com.example.package.bar", - container: "vendor", + container: "system_ext", srcs: ["bar.aconfig"], } diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go index 205b85590..7185a8941 100644 --- a/android/aconfig_providers.go +++ b/android/aconfig_providers.go @@ -238,8 +238,7 @@ func getContainer(m Module) string { } else if base.ProductSpecific() { container = "product" } else if base.SystemExtSpecific() { - // system_ext and system partitions should be treated as one container - container = "system" + container = "system_ext" } return container @@ -255,8 +254,7 @@ func getContainerUsingProviders(ctx OtherModuleProviderContext, m Module) string } else if commonInfo.ProductSpecific { container = "product" } else if commonInfo.SystemExtSpecific { - // system_ext and system partitions should be treated as one container - container = "system" + container = "system_ext" } return container |