diff options
| author | 2020-09-03 01:29:49 -0400 | |
|---|---|---|
| committer | 2020-09-03 01:29:49 -0400 | |
| commit | 16f23a4038d9156286a06ba757eaa9c1c86e562a (patch) | |
| tree | ccca17aedf7f275b1fac669b8103c215987e500d /java/builder.go | |
| parent | 4d947f0ea84f80939348d1f792730b38ca5720c5 (diff) | |
Check UseRBE is set before replacing any template with the RE version.
Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/builder.go b/java/builder.go index 7318fcbad..3043e46db 100644 --- a/java/builder.go +++ b/java/builder.go @@ -385,7 +385,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. "outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(), "javaVersion": flags.javaVersion.String(), } - if ctx.Config().IsEnvTrue("RBE_TURBINE") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") { rule = turbineRE args["implicits"] = strings.Join(deps.Strings(), ",") } @@ -452,7 +452,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab annoDir = filepath.Join(shardDir, annoDir) } rule := javac - if ctx.Config().IsEnvTrue("RBE_JAVAC") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") { rule = javacRE } ctx.Build(pctx, android.BuildParams{ @@ -480,7 +480,7 @@ func TransformResourcesToJar(ctx android.ModuleContext, outputFile android.Writa jarArgs []string, deps android.Paths) { rule := jar - if ctx.Config().IsEnvTrue("RBE_JAR") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAR") { rule = jarRE } ctx.Build(pctx, android.BuildParams{ |