Merge "Implement support for build_prop.Footer_files" into main (c26262eb) · Commits · e / os / android_build_soong

android/build_prop.go

+20 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		package android

		import (
		"fmt"

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

		@@ -173,7 +175,16 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		postProcessCmd.Text(outputFilePath.String())
		postProcessCmd.Flags(p.properties.Block_list)

		rule.Command().Text("echo").Text(proptools.NinjaAndShellEscape("# end of file")).FlagWithArg(">> ", outputFilePath.String())
		for _, footer := range p.properties.Footer_files {
		path := PathForModuleSrc(ctx, footer)
		rule.appendText(outputFilePath, "####################################")
		rule.appendTextf(outputFilePath, "# Adding footer from %v", footer)
		rule.appendTextf(outputFilePath, "# with path %v", path)
		rule.appendText(outputFilePath, "####################################")
		rule.Command().Text("cat").FlagWithInput("", path).FlagWithArg(">> ", outputFilePath.String())
		}

		rule.appendText(outputFilePath, "# end of file")

		rule.Build(ctx.ModuleName(), "generating build.prop")

		@@ -184,6 +195,14 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		p.outputFilePath = outputFilePath
		}

		func (r *RuleBuilder) appendText(path ModuleOutPath, text string) {
		r.Command().Text("echo").Text(proptools.NinjaAndShellEscape(text)).FlagWithArg(">> ", path.String())
		}

		func (r *RuleBuilder) appendTextf(path ModuleOutPath, format string, a ...any) {
		r.appendText(path, fmt.Sprintf(format, a...))
		}

		func (p *buildPropModule) AndroidMkEntries() []AndroidMkEntries {
		return []AndroidMkEntries{{
		Class: "ETC",