diff options
author | Colin Cross <ccross@android.com> | 2019-02-28 11:00:01 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-03-04 18:11:53 +0000 |
commit | 0b9f31fb0834fd84bc4d5e3b99d67e80e6e2224d (patch) | |
tree | 822385829aba1ce8d913e4c8d9637cf7320015f7 /cmd | |
parent | 7abf560cb0028bf8413a35f2fa71a4d528b6da67 (diff) | |
download | build_soong-0b9f31fb0834fd84bc4d5e3b99d67e80e6e2224d.tar.gz build_soong-0b9f31fb0834fd84bc4d5e3b99d67e80e6e2224d.tar.bz2 build_soong-0b9f31fb0834fd84bc4d5e3b99d67e80e6e2224d.zip |
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
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/pom2bp/pom2bp.go | 2 | ||||
-rw-r--r-- | cmd/pom2mk/pom2mk.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go index a79c84f4..a399b283 100644 --- a/cmd/pom2bp/pom2bp.go +++ b/cmd/pom2bp/pom2bp.go @@ -605,7 +605,7 @@ Usage: %s [--rewrite <regex>=<replace>] [-exclude <module>] [--extra-deps <modul buf := &bytes.Buffer{} fmt.Fprintln(buf, "// Automatically generated with:") - fmt.Fprintln(buf, "// pom2bp", strings.Join(proptools.ShellEscape(os.Args[1:]), " ")) + fmt.Fprintln(buf, "// pom2bp", strings.Join(proptools.ShellEscapeList(os.Args[1:]), " ")) for _, pom := range poms { var err error diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go index fc836411..94e56194 100644 --- a/cmd/pom2mk/pom2mk.go +++ b/cmd/pom2mk/pom2mk.go @@ -483,7 +483,7 @@ Usage: %s [--rewrite <regex>=<replace>] [-exclude <module>] [--extra-deps <modul } fmt.Println("# Automatically generated with:") - fmt.Println("# pom2mk", strings.Join(proptools.ShellEscape(os.Args[1:]), " ")) + fmt.Println("# pom2mk", strings.Join(proptools.ShellEscapeList(os.Args[1:]), " ")) fmt.Println("LOCAL_PATH := $(call my-dir)") for _, pom := range poms { |