Replace *Escape with *EscapeList am: 0b9f31fb08
am: 5b6741d94d
am: 29560640a9
Change-Id: I04930d0949d8fb3317317aad7f577b75e47a9505
This commit is contained in:
@@ -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)...)
|
||||
|
@@ -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/`
|
||||
|
@@ -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 {
|
||||
|
Reference in New Issue
Block a user