diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-07 14:47:21 +0000 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2021-09-07 15:20:50 +0000 |
| commit | a510a2db107e15b7f413f3ee6e7d4fe8a70e7a55 (patch) | |
| tree | 0a17310e3798b5381e33cd97fada3750e8ec8f00 /java/builder.go | |
| parent | 4e88859af01376b9977bcc03174c182353c172d4 (diff) | |
| parent | e78212a55c4742169d788f5c5b9ae9001b95da2e (diff) | |
Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538
Bug: b/198045383
Merged-In: I6df58b4e700f0d231367af2710672d731d20a736
Change-Id: Ide5966e039ae5232438946fa064d8621088bc1ee
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 7318fcbad..53f08101b 100644 --- a/java/builder.go +++ b/java/builder.go @@ -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{ |