diff options
| author | 2020-05-20 11:27:16 -0700 | |
|---|---|---|
| committer | 2020-05-28 11:56:48 -0700 | |
| commit | 366afc5011ca300d6bd14246c29e08b77387a12d (patch) | |
| tree | 14ac254d861149ecb5ef995c6b3a07450ea26d0c /java/app_builder.go | |
| parent | 8f37ec82d9384bfcaa243c0a75174c067e05ab35 (diff) | |
Add support for remote-execution / caching of jar/zip actions
Test: Ran a build with `RBE_JAR="true" RBE_JAR_EXEC_STRATEGY="remote"
RBE_ZIP="true" RBE_ZIP_EXEC_STRATEGY="remote" ... use_rbe m` and that
succeeded.
Bug: b/156765207
Change-Id: Ia17b532fbb282be414adf879914870082dd0841b
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index c3918d8e8..014bd54f1 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -232,14 +232,20 @@ func TransformJniLibsToJar(ctx android.ModuleContext, outputFile android.Writabl "-f", j.path.String()) } + rule := zip + args := map[string]string{ + "jarArgs": strings.Join(proptools.NinjaAndShellEscapeList(jarArgs), " "), + } + if ctx.Config().IsEnvTrue("RBE_ZIP") { + rule = zipRE + args["implicits"] = strings.Join(deps.Strings(), ",") + } ctx.Build(pctx, android.BuildParams{ - Rule: zip, + Rule: rule, Description: "zip jni libs", Output: outputFile, Implicits: deps, - Args: map[string]string{ - "jarArgs": strings.Join(proptools.NinjaAndShellEscapeList(jarArgs), " "), - }, + Args: args, }) } |