Merge changes from topic... (e1234e51) · Commits · e / os / android_build_soong

Android.bp

+11 −14

Original line number	Diff line number	Diff line
		@@ -121,20 +121,6 @@ dexpreopt_systemserver_check {
		name: "dexpreopt_systemserver_check",
		}

		// buildinfo.prop contains common properties for system/build.prop, like ro.build.version.*
		// TODO(b/322090587): merge this to gen_build_prop.py script.
		buildinfo_prop {
		name: "buildinfo.prop",

		// not installable because this will be included to system/build.prop
		installable: false,

		product_config: ":product_config",

		// Currently, only microdroid can refer to buildinfo.prop
		visibility: ["//packages/modules/Virtualization/build/microdroid"],
		}

		// container for apex_contributions selected using build flags
		all_apex_contributions {
		name: "all_apex_contributions",
		@@ -144,3 +130,14 @@ product_config {
		name: "product_config",
		visibility: ["//device/google/cuttlefish/system_image"],
		}

		build_prop {
		name: "system-build.prop",
		stem: "build.prop",
		product_config: ":product_config",
		// Currently, only microdroid and cf system image can refer to system-build.prop
		visibility: [
		"//device/google/cuttlefish/system_image",
		"//packages/modules/Virtualization/build/microdroid",
		],
		}

android/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ bootstrap_go_package {
		"arch_module_context.go",
		"base_module_context.go",
		"build_prop.go",
		"buildinfo_prop.go",
		"compliance_metadata.go",
		"config.go",
		"container.go",

android/build_prop.go

+44 −5

Original line number	Diff line number	Diff line
		@@ -31,10 +31,6 @@ type buildPropProperties struct {
		// properties in prop_files.
		Block_list []string

		// Path to the input prop files. The contents of the files are directly
		// emitted to the output
		Prop_files []string `android:"path"`

		// Files to be appended at the end of build.prop. These files are appended after
		// post_process_props without any further checking.
		Footer_files []string `android:"path"`
		@@ -56,10 +52,34 @@ func (p *buildPropModule) stem() string {
		return proptools.StringDefault(p.properties.Stem, "build.prop")
		}

		func (p *buildPropModule) propFiles(ctx ModuleContext) Paths {
		partition := p.PartitionTag(ctx.DeviceConfig())
		if partition == "system" {
		return ctx.Config().SystemPropFiles(ctx)
		}
		return nil
		}

		func shouldAddBuildThumbprint(config Config) bool {
		knownOemProperties := []string{
		"ro.product.brand",
		"ro.product.name",
		"ro.product.device",
		}

		for _, knownProp := range knownOemProperties {
		if InList(knownProp, config.OemProperties()) {
		return true
		}
		}
		return false
		}

		func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		p.outputFilePath = PathForModuleOut(ctx, "build.prop").OutputPath
		if !ctx.Config().KatiEnabled() {
		WriteFileRule(ctx, p.outputFilePath, "# no build.prop if kati is disabled")
		ctx.SetOutputFiles(Paths{p.outputFilePath}, "")
		return
		}

		@@ -93,6 +113,7 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		cmd.FlagWithInput("--platform-preview-sdk-fingerprint-file=", ApiFingerprintPath(ctx))
		cmd.FlagWithInput("--product-config=", PathForModuleSrc(ctx, proptools.String(p.properties.Product_config)))
		cmd.FlagWithArg("--partition=", partition)
		cmd.FlagForEachInput("--prop-files=", ctx.Config().SystemPropFiles(ctx))
		cmd.FlagWithOutput("--out=", p.outputFilePath)

		postProcessCmd := rule.Command().BuiltTool("post_process_props")
		@@ -100,7 +121,12 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		postProcessCmd.Flag("--allow-dup")
		}
		postProcessCmd.FlagWithArg("--sdk-version ", config.PlatformSdkVersion().String())
		if ctx.Config().EnableUffdGc() == "default" {
		postProcessCmd.FlagWithInput("--kernel-version-file-for-uffd-gc ", PathForOutput(ctx, "dexpreopt/kernel_version_for_uffd_gc.txt"))
		} else {
		// still need to pass an empty string to kernel-version-file-for-uffd-gc
		postProcessCmd.FlagWithArg("--kernel-version-file-for-uffd-gc ", `""`)
		}
		postProcessCmd.Text(p.outputFilePath.String())
		postProcessCmd.Flags(p.properties.Block_list)

		@@ -114,6 +140,19 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		ctx.SetOutputFiles(Paths{p.outputFilePath}, "")
		}

		func (p *buildPropModule) AndroidMkEntries() []AndroidMkEntries {
		return []AndroidMkEntries{{
		Class: "ETC",
		OutputFile: OptionalPathForPath(p.outputFilePath),
		ExtraEntries: []AndroidMkExtraEntriesFunc{
		func(ctx AndroidMkExtraEntriesContext, entries *AndroidMkEntries) {
		entries.SetString("LOCAL_MODULE_PATH", p.installPath.String())
		entries.SetString("LOCAL_INSTALLED_MODULE_STEM", p.outputFilePath.Base())
		},
		},
		}}
		}

		// build_prop module generates {partition}/build.prop file. At first common build properties are
		// printed based on Soong config variables. And then prop_files are printed as-is. Finally,
		// post_process_props tool is run to check if the result build.prop is valid or not.

android/buildinfo_prop.go

deleted100644 → 0

+0 −132

Original line number	Diff line number	Diff line
		// Copyright 2022 Google Inc. All rights reserved.
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package android

		import (
		"github.com/google/blueprint/proptools"
		)

		func init() {
		ctx := InitRegistrationContext
		ctx.RegisterModuleType("buildinfo_prop", buildinfoPropFactory)
		}

		type buildinfoPropProperties struct {
		// Whether this module is directly installable to one of the partitions. Default: true.
		Installable *bool

		Product_config *string `android:"path"`
		}

		type buildinfoPropModule struct {
		ModuleBase

		properties buildinfoPropProperties

		outputFilePath OutputPath
		installPath InstallPath
		}

		func (p *buildinfoPropModule) installable() bool {
		return proptools.BoolDefault(p.properties.Installable, true)
		}

		func shouldAddBuildThumbprint(config Config) bool {
		knownOemProperties := []string{
		"ro.product.brand",
		"ro.product.name",
		"ro.product.device",
		}

		for _, knownProp := range knownOemProperties {
		if InList(knownProp, config.OemProperties()) {
		return true
		}
		}
		return false
		}

		func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		if ctx.ModuleName() != "buildinfo.prop" \|\| ctx.ModuleDir() != "build/soong" {
		ctx.ModuleErrorf("There can only be one buildinfo_prop module in build/soong")
		return
		}
		p.outputFilePath = PathForModuleOut(ctx, p.Name()).OutputPath
		ctx.SetOutputFiles(Paths{p.outputFilePath}, "")

		if !ctx.Config().KatiEnabled() {
		WriteFileRule(ctx, p.outputFilePath, "# no buildinfo.prop if kati is disabled")
		return
		}

		rule := NewRuleBuilder(pctx, ctx)

		config := ctx.Config()

		cmd := rule.Command().BuiltTool("buildinfo")

		cmd.FlagWithInput("--build-hostname-file=", config.BuildHostnameFile(ctx))
		// Note: depending on BuildNumberFile will cause the build.prop file to be rebuilt
		// every build, but that's intentional.
		cmd.FlagWithInput("--build-number-file=", config.BuildNumberFile(ctx))
		// Export build thumbprint only if the product has specified at least one oem fingerprint property
		// b/17888863
		if shouldAddBuildThumbprint(config) {
		// In the previous make implementation, a dependency was not added on the thumbprint file
		cmd.FlagWithArg("--build-thumbprint-file=", config.BuildThumbprintFile(ctx).String())
		}
		cmd.FlagWithArg("--build-username=", config.Getenv("BUILD_USERNAME"))
		// Technically we should also have a dependency on BUILD_DATETIME_FILE,
		// but it can be either an absolute or relative path, which is hard to turn into
		// a Path object. So just rely on the BuildNumberFile always changing to cause
		// us to rebuild.
		cmd.FlagWithArg("--date-file=", ctx.Config().Getenv("BUILD_DATETIME_FILE"))
		cmd.FlagWithInput("--platform-preview-sdk-fingerprint-file=", ApiFingerprintPath(ctx))
		cmd.FlagWithInput("--product-config=", PathForModuleSrc(ctx, proptools.String(p.properties.Product_config)))
		cmd.FlagWithOutput("--out=", p.outputFilePath)

		rule.Build(ctx.ModuleName(), "generating buildinfo props")

		if !p.installable() {
		p.SkipInstall()
		}

		p.installPath = PathForModuleInstall(ctx)
		ctx.InstallFile(p.installPath, p.Name(), p.outputFilePath)
		}

		func (p *buildinfoPropModule) AndroidMkEntries() []AndroidMkEntries {
		return []AndroidMkEntries{{
		Class: "ETC",
		OutputFile: OptionalPathForPath(p.outputFilePath),
		ExtraEntries: []AndroidMkExtraEntriesFunc{
		func(ctx AndroidMkExtraEntriesContext, entries *AndroidMkEntries) {
		entries.SetString("LOCAL_MODULE_PATH", p.installPath.String())
		entries.SetString("LOCAL_INSTALLED_MODULE_STEM", p.outputFilePath.Base())
		entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !p.installable())
		},
		},
		}}
		}

		// buildinfo_prop module generates a build.prop file, which contains a set of common
		// system/build.prop properties, such as ro.build.version.*. Not all properties are implemented;
		// currently this module is only for microdroid.
		func buildinfoPropFactory() Module {
		module := &buildinfoPropModule{}
		module.AddProperties(&module.properties)
		InitAndroidModule(module)
		return module
		}

android/config.go

+8 −0

Original line number	Diff line number	Diff line
		@@ -2081,3 +2081,11 @@ func (c *config) UseDebugArt() bool {

		return Bool(c.productVariables.Eng)
		}

		func (c *config) SystemPropFiles(ctx PathContext) Paths {
		return PathsForSource(ctx, c.productVariables.SystemPropFiles)
		}

		func (c *config) EnableUffdGc() string {
		return String(c.productVariables.EnableUffdGc)
		}