StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Treat system_ext as system container am: 01efb83420

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261301

Change-Id: Ic6c35f5e647e8693a852f8528ff5758f5ae8693e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Shen
2024-09-13 01:43:31 +00:00
committed by Automerger Merge Worker
parent fea92ff7d7 01efb83420
commit bf9c8f0613
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
aconfig/aconfig_declarations.go
View File

@@ -88,6 +88,13 @@ func (module *DeclarationsModule) DepsMutator(ctx android.BottomUpMutatorContext
ctx.PropertyErrorf("container", "missing container property") 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 // Add a dependency on the aconfig_value_sets defined in
// RELEASE_ACONFIG_VALUE_SETS, and add any aconfig_values that // RELEASE_ACONFIG_VALUE_SETS, and add any aconfig_values that
// match our package. // match our package.

2
aconfig/codegen/java_aconfig_library_test.go
View File

@@ -260,7 +260,7 @@ func TestMkEntriesMatchedContainer(t *testing.T) {
aconfig_declarations { aconfig_declarations {
name: "my_aconfig_declarations_bar", name: "my_aconfig_declarations_bar",
package: "com.example.package.bar", package: "com.example.package.bar",
container: "system_ext", container: "vendor",
srcs: ["bar.aconfig"], srcs: ["bar.aconfig"],
} }

3
android/aconfig_providers.go
View File

@@ -233,7 +233,8 @@ func getAconfigFilePaths(m *ModuleBase, aconfigFiles map[string]Paths) (paths Pa
} else if m.ProductSpecific() { } else if m.ProductSpecific() {
container = "product" container = "product"
} else if m.SystemExtSpecific() { } else if m.SystemExtSpecific() {
container = "system_ext" // system_ext and system partitions should be treated as one container
container = "system"
} }
paths = append(paths, aconfigFiles[container]...) paths = append(paths, aconfigFiles[container]...)