Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50 (239d7508) · Commits · e / os / android_build_soong

OWNERS

+3 −1

Original line number	Diff line number	Diff line
		@@ -13,3 +13,5 @@ mrziwang@google.com
		spandandas@google.com
		weiwli@google.com
		yudiliu@google.com

		per-file build/soong/ui/build/androidmk_denylist.go = joeo@google.com, weiwli@google.com
		No newline at end of file

README.md

+4 −1

Original line number	Diff line number	Diff line
		@@ -314,6 +314,9 @@ subpackages) can use this module.
		* `["//visibility:override"]`: Discards any rules inherited from defaults or a
		creating module. Can only be used at the beginning of a list of visibility
		rules.
		* `["//visibility:any_partition"]`: Any modules of type android_filesystem
		or android_system_image can use this module. Intended for modules that no one
		should link against, but should still be included in soong-built partitions.
		* `["//some/package:__pkg__", "//other/package:__pkg__"]`: Only modules in
		`some/package` and `other/package` (defined in `some/package/*.bp` and
		`other/package/*.bp`) have access to this module. Note that sub-packages do not
		@@ -603,7 +606,7 @@ ANDROID_BUILD_ENVIRONMENT_CONFIG_DIR=build/soong \
		* [Build Performance](docs/perf.md)
		* [Generating CLion Projects](docs/clion.md)
		* [Generating YouCompleteMe/VSCode compile\_commands.json file](docs/compdb.md)
		* Make-specific documentation: [build/make/README.md](https://android.googlesource.com/platform/build/+/master/README.md)
		* Make-specific documentation: [build/make/README.md](https://android.googlesource.com/platform/build/+/main/README.md)

		## Developing for Soong

aconfig/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ bootstrap_go_package {
		"aconfig_declarations_test.go",
		"aconfig_values_test.go",
		"aconfig_value_set_test.go",
		"all_aconfig_declarations_test.go",
		],
		pluginFor: ["soong_build"],
		}

aconfig/aconfig_declarations.go

+12 −74

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@ type DeclarationsModule struct {

		// Container(system/vendor/apex) that this module belongs to
		Container string

		// The flags will only be repackaged if this prop is true.
		Exportable bool
		}

		intermediatePath android.WritablePath
		@@ -112,33 +115,11 @@ func optionalVariable(prefix string, value string) string {
		return sb.String()
		}

		// Provider published by aconfig_value_set
		type DeclarationsProviderData struct {
		Package string
		Container string
		IntermediateCacheOutputPath android.WritablePath
		IntermediateDumpOutputPath android.WritablePath
		}

		var DeclarationsProviderKey = blueprint.NewProvider(DeclarationsProviderData{})

		// This is used to collect the aconfig declarations info on the transitive closure,
		// the data is keyed on the container.
		type TransitiveDeclarationsInfo struct {
		AconfigFiles map[string]android.Paths
		}

		var TransitiveDeclarationsInfoProvider = blueprint.NewProvider(TransitiveDeclarationsInfo{})

		func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		// Get the values that came from the global RELEASE_ACONFIG_VALUE_SETS flag
		valuesFiles := make([]android.Path, 0)
		ctx.VisitDirectDeps(func(dep android.Module) {
		if !ctx.OtherModuleHasProvider(dep, valueSetProviderKey) {
		// Other modules get injected as dependencies too, for example the license modules
		return
		}
		depData := ctx.OtherModuleProvider(dep, valueSetProviderKey).(valueSetProviderData)
		if depData, ok := android.OtherModuleProvider(ctx, dep, valueSetProviderKey); ok {
		paths, ok := depData.AvailablePackages[module.properties.Package]
		if ok {
		valuesFiles = append(valuesFiles, paths...)
		@@ -146,6 +127,7 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module
		module.properties.Values = append(module.properties.Values, path.String())
		}
		}
		}
		})

		// Intermediate format
		@@ -177,56 +159,12 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module
		Description: "aconfig_text",
		})

		ctx.SetProvider(DeclarationsProviderKey, DeclarationsProviderData{
		android.SetProvider(ctx, android.AconfigDeclarationsProviderKey, android.AconfigDeclarationsProviderData{
		Package: module.properties.Package,
		Container: module.properties.Container,
		Exportable: module.properties.Exportable,
		IntermediateCacheOutputPath: intermediateCacheFilePath,
		IntermediateDumpOutputPath: intermediateDumpFilePath,
		})

		}
		func CollectDependencyAconfigFiles(ctx android.ModuleContext, mergedAconfigFiles *map[string]android.Paths) {
		if *mergedAconfigFiles == nil {
		*mergedAconfigFiles = make(map[string]android.Paths)
		}
		ctx.VisitDirectDeps(func(module android.Module) {
		if dep := ctx.OtherModuleProvider(module, DeclarationsProviderKey).(DeclarationsProviderData); dep.IntermediateCacheOutputPath != nil {
		(mergedAconfigFiles)[dep.Container] = append((mergedAconfigFiles)[dep.Container], dep.IntermediateCacheOutputPath)
		return
		}
		if dep := ctx.OtherModuleProvider(module, TransitiveDeclarationsInfoProvider).(TransitiveDeclarationsInfo); len(dep.AconfigFiles) > 0 {
		for container, v := range dep.AconfigFiles {
		(mergedAconfigFiles)[container] = append((mergedAconfigFiles)[container], v...)
		}
		}
		})

		for container, aconfigFiles := range *mergedAconfigFiles {
		(*mergedAconfigFiles)[container] = mergeAconfigFiles(ctx, aconfigFiles)
		}

		ctx.SetProvider(TransitiveDeclarationsInfoProvider, TransitiveDeclarationsInfo{
		AconfigFiles: *mergedAconfigFiles,
		})
		}

		func mergeAconfigFiles(ctx android.ModuleContext, inputs android.Paths) android.Paths {
		inputs = android.LastUniquePaths(inputs)
		if len(inputs) == 1 {
		return android.Paths{inputs[0]}
		}

		output := android.PathForModuleOut(ctx, "aconfig_merged.pb")

		ctx.Build(pctx, android.BuildParams{
		Rule: mergeAconfigFilesRule,
		Description: "merge aconfig files",
		Inputs: inputs,
		Output: output,
		Args: map[string]string{
		"flags": android.JoinWithPrefix(inputs.Strings(), "--cache "),
		},
		})

		return android.Paths{output}
		}

aconfig/aconfig_declarations_test.go

+22 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ func TestAconfigDeclarations(t *testing.T) {
		name: "module_name",
		package: "com.example.package",
		container: "com.android.foo",
		exportable: true,
		srcs: [
		"foo.aconfig",
		"bar.aconfig",
		@@ -38,9 +39,10 @@ func TestAconfigDeclarations(t *testing.T) {
		module := result.ModuleForTests("module_name", "").Module().(*DeclarationsModule)

		// Check that the provider has the right contents
		depData := result.ModuleProvider(module, DeclarationsProviderKey).(DeclarationsProviderData)
		depData, _ := android.SingletonModuleProvider(result, module, android.AconfigDeclarationsProviderKey)
		android.AssertStringEquals(t, "package", depData.Package, "com.example.package")
		android.AssertStringEquals(t, "container", depData.Container, "com.android.foo")
		android.AssertBoolEquals(t, "exportable", depData.Exportable, true)
		if !strings.HasSuffix(depData.IntermediateCacheOutputPath.String(), "/intermediate.pb") {
		t.Errorf("Missing intermediates proto path in provider: %s", depData.IntermediateCacheOutputPath.String())
		}
		@@ -48,3 +50,22 @@ func TestAconfigDeclarations(t *testing.T) {
		t.Errorf("Missing intermediates text path in provider: %s", depData.IntermediateDumpOutputPath.String())
		}
		}

		func TestAconfigDeclarationsWithExportableUnset(t *testing.T) {
		bp := `
		aconfig_declarations {
		name: "module_name",
		package: "com.example.package",
		container: "com.android.foo",
		srcs: [
		"foo.aconfig",
		"bar.aconfig",
		],
		}
		`
		result := runTest(t, android.FixtureExpectsNoErrors, bp)

		module := result.ModuleForTests("module_name", "").Module().(*DeclarationsModule)
		depData, _ := android.SingletonModuleProvider(result, module, android.AconfigDeclarationsProviderKey)
		android.AssertBoolEquals(t, "exportable", depData.Exportable, false)
		}