From 0b9f31fb0834fd84bc4d5e3b99d67e80e6e2224d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 28 Feb 2019 11:00:01 -0800 Subject: 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 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java.go') 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) -- cgit v1.2.3-59-g8ed1b