StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of a7beb10933 to rvc-dev

Browse Source 
Bug: b/167405184
Change-Id: Ib35af2813e7b60932df33f905d8e0398727ee545
Merged-In: I4d06b4fa190d6185b15aa98cb6f1a33f9702981e
This commit is contained in:
Kousik Kumar
2020-09-23 08:34:42 +00:00
parent 63e1c37e6f a7beb10933
commit 602859b186
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/rbe.mk
View File

@@ -34,12 +34,6 @@ ifneq ($(filter-out false,$(USE_RBE)),)
cxx_compare := false cxx_compare := false
endif endif
ifdef RBE_CXX_COMPARE
cxx_compare := $(RBE_CXX_COMPARE)
else
cxx_compare := "false"
endif
ifdef RBE_JAVAC_EXEC_STRATEGY ifdef RBE_JAVAC_EXEC_STRATEGY
javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY) javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)
else else
@@ -63,7 +57,7 @@ ifneq ($(filter-out false,$(USE_RBE)),)
java_r8_d8_platform := $(platform),Pool=java16 java_r8_d8_platform := $(platform),Pool=java16
RBE_WRAPPER := $(rbe_dir)/rewrapper RBE_WRAPPER := $(rbe_dir)/rewrapper
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 # Append rewrapper to existing *_WRAPPER variables so it's possible to
# use both ccache and rewrapper. # use both ccache and rewrapper.