Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b340dd21 authored Sep 13, 2024 by Dennis Shen Committed by Automerger Merge Worker Sep 13, 2024

Treat system_ext as system container am: 01efb834 am: bf9c8f06

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

Change-Id: I51244bb6eb12207b122c5c1316347516726d23df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d299760e bf9c8f06

aconfig/aconfig_declarations.go

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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.

aconfig/codegen/java_aconfig_library_test.go

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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"],
	}		}

android/aconfig_providers.go

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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]...)