diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-09-10 09:50:35 +0000 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2021-09-02 19:15:35 +0000 |
| commit | 4e2977ee81771968a31484a3b7d45e5bb5b8bf1c (patch) | |
| tree | d532f75ee3a8b1dd0bc441ea7e9fa4bf415a7cf4 /java/builder.go | |
| parent | 9f6fa868c5161c982f5dd835b25f997fdecb6e30 (diff) | |
Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252
Test:
1. Applied https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/15723183, confirmed that the build fails on rvc-dev (by running `USE_RBE=false m `)
2. Subsequently applied this patch and tested to confirm that the failure is fixed (by running `USE_RBE=false m out/soong/.intermediates/vendor/qcom/sm7250/proprietary/commonsys/qcrilOemHook/qcrilmsgtunnel/android_common/combined/qcrilmsgtunnel.jar` and `USE_RBE=true m out/soong/.intermediates/vendor/qcom/sm7250/proprietary/commonsys/qcrilOemHook/qcrilmsgtunnel/android_common/combined/qcrilmsgtunnel.jar`).
Bug: b/198045383
Merged-In: I6df58b4e700f0d231367af2710672d731d20a736
Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
(cherry picked from commit f15ed4fe6116a60a9518a8c8ca193da1b4439d62)
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{ |