Escape Host*Variable contents am: 1c35f243c5 am: 72d35eb0a5 (1e370913) · Commits · e / os / android_build_soong

android/package_ctx.go

+4 −3

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import (
		"strings"

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

		"android/soong/remoteexec"
		)
		@@ -173,7 +174,7 @@ func (p PackageContext) SourcePathVariableWithEnvOverride(name, path, env string
		// package-scoped variable's initialization.
		func (p PackageContext) HostBinToolVariable(name, path string) blueprint.Variable {
		return p.VariableFunc(name, func(ctx PackageVarContext) string {
		return ctx.Config().HostToolPath(ctx, path).String()
		return proptools.NinjaAndShellEscape(ctx.Config().HostToolPath(ctx, path).String())
		})
		}

		@@ -183,7 +184,7 @@ func (p PackageContext) HostBinToolVariable(name, path string) blueprint.Variabl
		// package-scoped variable's initialization.
		func (p PackageContext) HostJNIToolVariable(name, path string) blueprint.Variable {
		return p.VariableFunc(name, func(ctx PackageVarContext) string {
		return ctx.Config().HostJNIToolPath(ctx, path).String()
		return proptools.NinjaAndShellEscape(ctx.Config().HostJNIToolPath(ctx, path).String())
		})
		}

		@@ -193,7 +194,7 @@ func (p PackageContext) HostJNIToolVariable(name, path string) blueprint.Variabl
		// part of a package-scoped variable's initialization.
		func (p PackageContext) HostJavaToolVariable(name, path string) blueprint.Variable {
		return p.VariableFunc(name, func(ctx PackageVarContext) string {
		return ctx.Config().HostJavaToolPath(ctx, path).String()
		return proptools.NinjaAndShellEscape(ctx.Config().HostJavaToolPath(ctx, path).String())
		})
		}