Revert "Treat system_ext as system container"
This reverts commit 01efb834208f02892bf6b3d316c02fd44ea91af3,
but also has some changes for the CLs added after the commit.
Reason for revert: Revive system_ext container.
System container must not include system_ext aconfigs.
Bug: 385213580
Test: lunch gsi_x86_64_soong_system-trunk_staging-userdebug && m
diff the aconfig_flags.pb
Change-Id: I5ffe699595b5734d3555eb248cf36dedfc2d2105
diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go
index 9a9e568..e38396d 100644
--- a/aconfig/aconfig_declarations.go
+++ b/aconfig/aconfig_declarations.go
@@ -88,13 +88,6 @@
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 8854369..b9455f7 100644
--- a/aconfig/codegen/java_aconfig_library_test.go
+++ b/aconfig/codegen/java_aconfig_library_test.go
@@ -260,7 +260,7 @@
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 205b855..7185a89 100644
--- a/android/aconfig_providers.go
+++ b/android/aconfig_providers.go
@@ -238,8 +238,7 @@
} 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 @@
} 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