diff options
| author | 2025-01-05 23:35:25 -0800 | |
|---|---|---|
| committer | 2025-02-27 09:04:34 +0900 | |
| commit | 9c6a2f11735571c4d5bd38c7b7626b22a4ec21fa (patch) | |
| tree | 5e63df510992ffe3e068c1a0405746374198f57c /aconfig | |
| parent | e8d5d13b78ffe0db056f1329d87130c2068b75f7 (diff) | |
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
Diffstat (limited to 'aconfig')
| -rw-r--r-- | aconfig/aconfig_declarations.go | 7 | ||||
| -rw-r--r-- | aconfig/codegen/java_aconfig_library_test.go | 2 |
2 files changed, 1 insertions, 8 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"], } |