summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
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
commit0b9f31fb0834fd84bc4d5e3b99d67e80e6e2224d (patch)
tree822385829aba1ce8d913e4c8d9637cf7320015f7 /java/java.go
parent7abf560cb0028bf8413a35f2fa71a4d528b6da67 (diff)
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 'java/java.go')
-rw-r--r--java/java.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index d230810de..52d97c9e1 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1152,7 +1152,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
Output: servicesJar,
Implicits: services,
Args: map[string]string{
- "jarArgs": "-P META-INF/services/ " + strings.Join(proptools.NinjaAndShellEscape(zipargs), " "),
+ "jarArgs": "-P META-INF/services/ " + strings.Join(proptools.NinjaAndShellEscapeList(zipargs), " "),
},
})
jars = append(jars, servicesJar)