| commit | 3d0b43816adcb51d9fe039bcba2c85e6afb78413 | [log] [tgz] |
|---|---|---|
| author | Kousik Kumar <kousikk@google.com> | Thu Oct 15 05:08:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 15 05:08:46 2020 +0000 |
| tree | b7dd16a8d03fc16f6e7ad2a2570d3c5738f94a1f | |
| parent | d42a2006794bc9058e408cd5db53d465b7bebccb [diff] | |
| parent | 35e0e89aa7d0cf1588cae8a8329b0edf38a19615 [diff] |
resolve merge conflicts of 602859b18603fea642cbcd486563f6bfa981eb4d to rvc-d1-dev am: 3d723c29d1 am: 0d0d422359 am: 35e0e89aa7 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12735596 Change-Id: Ia83973413013c469231d28de0023dc516ca725ca
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