diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-03-14 07:36:54 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-03-14 07:36:54 -0700 |
| commit | a1f2566bd4b7bde5f1d05461cd62f5300fb67700 (patch) | |
| tree | dcbdf8c8a0a4948dc239dead059209933872119b | |
| parent | 0c08150120970c2ce1aea2135e6660728910ba52 (diff) | |
| parent | 4851a38c0d50f6497c3baee3f0f899c79a49b995 (diff) | |
Merge 4851a38c0d50f6497c3baee3f0f899c79a49b995 on remote branch
Change-Id: I644eab139c980ae9451213e3bfdb1c7b1f3e6ea6
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/rbe.mk | 22 |
2 files changed, 5 insertions, 19 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index bc67d6aedb..07619e8425 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=SKQ1.220213.001 +BUILD_ID=SKQ1.220303.001 diff --git a/core/rbe.mk b/core/rbe.mk index 366048f61d..91606d4004 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -34,34 +34,22 @@ ifneq ($(filter-out false,$(USE_RBE)),) cxx_compare := false endif - ifdef RBE_CXX_COMPARE - cxx_compare := $(RBE_CXX_COMPARE) - else - cxx_compare := "false" - endif - ifdef RBE_JAVAC_EXEC_STRATEGY javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY) else - # TODO(b/165009767): revert back to remote_local_fallback, when environment - # variables are set or remote actions are available - javac_exec_strategy := local + javac_exec_strategy := remote_local_fallback endif ifdef RBE_R8_EXEC_STRATEGY r8_exec_strategy := $(RBE_R8_EXEC_STRATEGY) else - # TODO(b/165009767): revert back to remote_local_fallback, when environment - # variables are set or remote actions are available - r8_exec_strategy := local + r8_exec_strategy := remote_local_fallback endif ifdef RBE_D8_EXEC_STRATEGY d8_exec_strategy := $(RBE_D8_EXEC_STRATEGY) else - # TODO(b/165009767): revert back to remote_local_fallback, when environment - # variables are set or remote actions are available - d8_exec_strategy := local + d8_exec_strategy := remote_local_fallback endif platform := container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62 @@ -69,9 +57,7 @@ ifneq ($(filter-out false,$(USE_RBE)),) java_r8_d8_platform := $(platform),Pool=java16 RBE_WRAPPER := $(rbe_dir)/rewrapper - - # TODO(b/169444426): Return to env_var_allowlist when updating binaries - RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform=$(cxx_platform) --compare=$(cxx_compare) + RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_allowlist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform=$(cxx_platform) --compare=$(cxx_compare) # Append rewrapper to existing *_WRAPPER variables so it's possible to # use both ccache and rewrapper. |