diff options
| author | 2025-03-04 04:59:42 -0800 | |
|---|---|---|
| committer | 2025-03-04 04:59:42 -0800 | |
| commit | 3f399e2208c84c114c80e50ad8278997488fb79e (patch) | |
| tree | a74cae57d12b47c2021d9380418ebeaa7bf04bde /aconfig | |
| parent | 5b10fad64f13666bd916a0b7143d1211b3c6c2f7 (diff) | |
| parent | 682791c35b3e4474a20411dfa2453ab1aeff57e1 (diff) | |
Revert "Treat system_ext as system container" am: 9c6a2f1173 am: 682791c35b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3438179
Change-Id: I3ba9e5da4a337900d54ce8875a7e274c8f4c1339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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"], } |