diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-07 14:32:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-07 14:32:59 +0000 |
| commit | e78212a55c4742169d788f5c5b9ae9001b95da2e (patch) | |
| tree | 9fcbaed8a43c3d5b356fcbd2fd9e98f9de4ea730 /java/builder.go | |
| parent | 233c1be0bdf85ae4dce75cd79ab04932be22af5b (diff) | |
| parent | 4e2977ee81771968a31484a3b7d45e5bb5b8bf1c (diff) | |
Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538
Change-Id: Ifa33cdad01dac8e81724d97f6373b745ff775ca9
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/builder.go b/java/builder.go index 0e7574e63..131f21aba 100644 --- a/java/builder.go +++ b/java/builder.go @@ -297,7 +297,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{ |