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

Commit 0b9f31fb authored by Colin Cross's avatar Colin Cross
Browse files

Replace *Escape with *EscapeList 

Follow the change to blueprint to make *Escape take and return a string
and add *EscapeList that take and return slices of strings.  Fix up
a few places that were unnecessarily converting a string to a slice
and back to a string.

Test: m nothing
Change-Id: I3fa87de175522205f36544ef76aa2f04aef1b936
parent 7abf560c

android/module.go

+6 −6
Original line number Diff line number Diff line
@@ -931,12 +931,12 @@ func convertBuildParams(params BuildParams) blueprint.BuildParams { 
		bparams.Implicits = append(bparams.Implicits, params.Implicit.String())

	}



	bparams.Outputs = proptools.NinjaEscape(bparams.Outputs)

	bparams.ImplicitOutputs = proptools.NinjaEscape(bparams.ImplicitOutputs)

	bparams.Inputs = proptools.NinjaEscape(bparams.Inputs)

	bparams.Implicits = proptools.NinjaEscape(bparams.Implicits)

	bparams.OrderOnly = proptools.NinjaEscape(bparams.OrderOnly)

	bparams.Depfile = proptools.NinjaEscape([]string{bparams.Depfile})[0]

	bparams.Outputs = proptools.NinjaEscapeList(bparams.Outputs)

	bparams.ImplicitOutputs = proptools.NinjaEscapeList(bparams.ImplicitOutputs)

	bparams.Inputs = proptools.NinjaEscapeList(bparams.Inputs)

	bparams.Implicits = proptools.NinjaEscapeList(bparams.Implicits)

	bparams.OrderOnly = proptools.NinjaEscapeList(bparams.OrderOnly)

	bparams.Depfile = proptools.NinjaEscapeList([]string{bparams.Depfile})[0]



	return bparams

}

android/rule_builder.go

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ func (r *RuleBuilder) Build(pctx PackageContext, ctx BuilderContext, name string 
	if len(r.Commands()) > 0 {

		ctx.Build(pctx, BuildParams{

			Rule: ctx.Rule(pctx, name, blueprint.RuleParams{

				Command:     strings.Join(proptools.NinjaEscape(r.Commands()), " && "),

				Command:     strings.Join(proptools.NinjaEscapeList(r.Commands()), " && "),

				CommandDeps: r.Tools().Strings(),

			}),

			Implicits:   r.Inputs(),

cc/compiler.go

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
	CheckBadCompilerFlags(ctx, "vendor.cflags", compiler.Properties.Target.Vendor.Cflags)

	CheckBadCompilerFlags(ctx, "recovery.cflags", compiler.Properties.Target.Recovery.Cflags)



	esc := proptools.NinjaAndShellEscape

	esc := proptools.NinjaAndShellEscapeList



	flags.CFlags = append(flags.CFlags, esc(compiler.Properties.Cflags)...)

	flags.CppFlags = append(flags.CppFlags, esc(compiler.Properties.Cppflags)...)

cc/linker.go

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags { 


	CheckBadLinkerFlags(ctx, "ldflags", linker.Properties.Ldflags)



	flags.LdFlags = append(flags.LdFlags, proptools.NinjaAndShellEscape(linker.Properties.Ldflags)...)

	flags.LdFlags = append(flags.LdFlags, proptools.NinjaAndShellEscapeList(linker.Properties.Ldflags)...)



	if ctx.Host() {

		rpath_prefix := `\$$ORIGIN/`

cc/tidy.go

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags { 
	if len(withTidyFlags) > 0 {

		flags.TidyFlags = append(flags.TidyFlags, withTidyFlags)

	}

	esc := proptools.NinjaAndShellEscape

	esc := proptools.NinjaAndShellEscapeList

	flags.TidyFlags = append(flags.TidyFlags, esc(tidy.Properties.Tidy_flags)...)

	// If TidyFlags is empty, add default header filter.

	if len(flags.TidyFlags) == 0 {