diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-05-29 13:56:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 13:56:58 +0000 |
| commit | 2b6185810a6addcd6dc0756339d8d1aedddd1c1a (patch) | |
| tree | 5b8214c45eb13d701b68259edd8b4861b8bc0579 /java/java.go | |
| parent | fbdd5e74e793d6e928044799dea5815f353446e9 (diff) | |
| parent | d996ff6a6876686c954979b65fa13cbd8eda0c29 (diff) | |
Merge "Add support for remote-execution / caching of jar/zip actions" am: c4cdba07d3 am: d996ff6a68
Change-Id: I41f544531788cfdf7a16560e24f27c9d31b186ad
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 5bbece479..d19c88e56 100644 --- a/java/java.go +++ b/java/java.go @@ -1465,13 +1465,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) } |