diff options
| author | 2020-08-18 01:07:12 +0000 | |
|---|---|---|
| committer | 2020-08-18 01:07:12 +0000 | |
| commit | b8b19daf9ddcb0f884e68e82cb5849d617a3c21c (patch) | |
| tree | fb2856ed3ae19e682f22b7af905f572472e5a998 | |
| parent | ed688224e9be1feff7323d2ed4f0d30080d1cf3d (diff) | |
| parent | 90905c0c68cc2a41dfb66d205ab80beb5f3c84ca (diff) | |
Merge "Make the default exec strategy for javac/r8/d8 remote local fallback." am: 90905c0c68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399527
Change-Id: I7e2b1be312e1d0ccf2b77f463bce343852aa091f
| -rw-r--r-- | java/config/config.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/config/config.go b/java/config/config.go index ef1ecc8b0..05da3b54b 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -148,9 +148,9 @@ func init() { pctx.HostBinToolVariable("DexpreoptGen", "dexpreopt_gen") pctx.VariableFunc("REJavaPool", remoteexec.EnvOverrideFunc("RBE_JAVA_POOL", "java16")) - pctx.VariableFunc("REJavacExecStrategy", remoteexec.EnvOverrideFunc("RBE_JAVAC_EXEC_STRATEGY", remoteexec.LocalExecStrategy)) - pctx.VariableFunc("RED8ExecStrategy", remoteexec.EnvOverrideFunc("RBE_D8_EXEC_STRATEGY", remoteexec.LocalExecStrategy)) - pctx.VariableFunc("RER8ExecStrategy", remoteexec.EnvOverrideFunc("RBE_R8_EXEC_STRATEGY", remoteexec.LocalExecStrategy)) + pctx.VariableFunc("REJavacExecStrategy", remoteexec.EnvOverrideFunc("RBE_JAVAC_EXEC_STRATEGY", remoteexec.RemoteLocalFallbackExecStrategy)) + pctx.VariableFunc("RED8ExecStrategy", remoteexec.EnvOverrideFunc("RBE_D8_EXEC_STRATEGY", remoteexec.RemoteLocalFallbackExecStrategy)) + pctx.VariableFunc("RER8ExecStrategy", remoteexec.EnvOverrideFunc("RBE_R8_EXEC_STRATEGY", remoteexec.RemoteLocalFallbackExecStrategy)) pctx.VariableFunc("RETurbineExecStrategy", remoteexec.EnvOverrideFunc("RBE_TURBINE_EXEC_STRATEGY", remoteexec.LocalExecStrategy)) pctx.VariableFunc("RESignApkExecStrategy", remoteexec.EnvOverrideFunc("RBE_SIGNAPK_EXEC_STRATEGY", remoteexec.LocalExecStrategy)) pctx.VariableFunc("REJarExecStrategy", remoteexec.EnvOverrideFunc("RBE_JAR_EXEC_STRATEGY", remoteexec.LocalExecStrategy)) |