diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-09 19:17:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 19:17:37 +0000 |
| commit | 274c905be61b47f86f6e64993942263f74ba0adb (patch) | |
| tree | 6ffc77ba4b4e255e865bb8a19ad40fedb77746e5 /java/builder.go | |
| parent | 9ee45ad09a949a1b94e2867c91c0f70b932a5e71 (diff) | |
| parent | a510a2db107e15b7f413f3ee6e7d4fe8a70e7a55 (diff) | |
Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183
Change-Id: I181bb735aaf2c3c51982f3f0d50497e3ba5184be
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{ |