diff options
| author | Colin Cross <ccross@android.com> | 2019-03-04 10:30:20 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-04 10:30:20 -0800 |
| commit | 9a4a2f313a56345ff0f597a90f9b8b278b2af56c (patch) | |
| tree | c6ce85c92e26b0b27352971718da9ad759435243 /java | |
| parent | 956c2c64c7ea0a6149c08d9390ad1ffa76f7e943 (diff) | |
| parent | 29560640a9e23db40158302d59a981668fface36 (diff) | |
| download | android_build_soong-9a4a2f313a56345ff0f597a90f9b8b278b2af56c.tar.gz android_build_soong-9a4a2f313a56345ff0f597a90f9b8b278b2af56c.tar.bz2 android_build_soong-9a4a2f313a56345ff0f597a90f9b8b278b2af56c.zip | |
Replace *Escape with *EscapeList am: 0b9f31fb08 am: 5b6741d94d
am: 29560640a9
Change-Id: I04930d0949d8fb3317317aad7f577b75e47a9505
Diffstat (limited to 'java')
| -rw-r--r-- | java/aar.go | 2 | ||||
| -rw-r--r-- | java/app_builder.go | 2 | ||||
| -rw-r--r-- | java/builder.go | 2 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 2 | ||||
| -rw-r--r-- | java/jacoco.go | 2 | ||||
| -rw-r--r-- | java/java.go | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/java/aar.go b/java/aar.go index 9eb2b279..c30632ea 100644 --- a/java/aar.go +++ b/java/aar.go @@ -168,7 +168,7 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext sdkContext, mani } else { versionName = ctx.Config().AppsDefaultVersionName() } - versionName = proptools.NinjaEscape([]string{versionName})[0] + versionName = proptools.NinjaEscape(versionName) linkFlags = append(linkFlags, "--version-name ", versionName) } diff --git a/java/app_builder.go b/java/app_builder.go index 6cc21595..bc91d55e 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -224,7 +224,7 @@ func TransformJniLibsToJar(ctx android.ModuleContext, outputFile android.Writabl Output: outputFile, Implicits: deps, Args: map[string]string{ - "jarArgs": strings.Join(proptools.NinjaAndShellEscape(jarArgs), " "), + "jarArgs": strings.Join(proptools.NinjaAndShellEscapeList(jarArgs), " "), }, }) } diff --git a/java/builder.go b/java/builder.go index aa61a85e..d8b303e4 100644 --- a/java/builder.go +++ b/java/builder.go @@ -300,7 +300,7 @@ func TransformResourcesToJar(ctx android.ModuleContext, outputFile android.Writa Output: outputFile, Implicits: deps, Args: map[string]string{ - "jarArgs": strings.Join(proptools.NinjaAndShellEscape(jarArgs), " "), + "jarArgs": strings.Join(proptools.NinjaAndShellEscapeList(jarArgs), " "), }, }) } diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index ca688326..64de21a4 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -281,7 +281,7 @@ func buildBootImageRuleForArch(ctx android.SingletonContext, image *bootImage, cmd.Flag(extraFlags) } - cmd.Textf(`|| ( echo %s ; false )`, proptools.ShellEscape([]string{failureMessage})[0]) + cmd.Textf(`|| ( echo %s ; false )`, proptools.ShellEscape(failureMessage)) installDir := filepath.Join("/system/framework", arch.String()) vdexInstallDir := filepath.Join("/system/framework") diff --git a/java/jacoco.go b/java/jacoco.go index 541a84af..8b6d4ac8 100644 --- a/java/jacoco.go +++ b/java/jacoco.go @@ -106,7 +106,7 @@ func jacocoFiltersToSpecs(filters []string) ([]string, error) { return nil, err } } - return proptools.NinjaAndShellEscape(specs), nil + return proptools.NinjaAndShellEscapeList(specs), nil } func jacocoFilterToSpec(filter string) (string, error) { diff --git a/java/java.go b/java/java.go index d230810d..52d97c9e 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) |