commit | 1ba06032f2e07e141320f326117bbd636988737d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Feb 23 08:43:06 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 23 08:43:06 2021 +0000 |
tree | 6932b7576c6dcd3519a2fd857bd5c50324fca533 | |
parent | 4f71c2a6db2a2887769d052f575259a710b3d6c5 [diff] | |
parent | 7a133df4e0dafbf85f3ff59784030d607c7cbf13 [diff] |
Merge "Merge ab/7061308 into stage." into stage-aosp-master
diff --git a/core/rbe.mk b/core/rbe.mk index 91606d4..19c0e42 100644 --- a/core/rbe.mk +++ b/core/rbe.mk
@@ -34,6 +34,12 @@ 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