diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-05-29 13:39:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 13:39:58 +0000 |
| commit | d996ff6a6876686c954979b65fa13cbd8eda0c29 (patch) | |
| tree | 45f8f705de9621f0d949e30ba1551797a5b29e05 /java/java.go | |
| parent | 460b1abf4e7eddeffbe4276e5a96e52fa0ba1584 (diff) | |
| parent | c4cdba07d33b7946d8ef47437e9f79473878103b (diff) | |
Merge "Add support for remote-execution / caching of jar/zip actions" am: c4cdba07d3
Change-Id: If86f8d80e00c881f79177990cc34cc40f7ba1c58
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 032aee610..162141d83 100644 --- a/java/java.go +++ b/java/java.go @@ -1456,13 +1456,19 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { serviceFile := file.String() zipargs = append(zipargs, "-C", filepath.Dir(serviceFile), "-f", serviceFile) } + rule := zip + args := map[string]string{ + "jarArgs": "-P META-INF/services/ " + strings.Join(proptools.NinjaAndShellEscapeList(zipargs), " "), + } + if ctx.Config().IsEnvTrue("RBE_ZIP") { + rule = zipRE + args["implicits"] = strings.Join(services.Strings(), ",") + } ctx.Build(pctx, android.BuildParams{ - Rule: zip, + Rule: rule, Output: servicesJar, Implicits: services, - Args: map[string]string{ - "jarArgs": "-P META-INF/services/ " + strings.Join(proptools.NinjaAndShellEscapeList(zipargs), " "), - }, + Args: args, }) jars = append(jars, servicesJar) } |