diff options
| -rw-r--r-- | core/rbe.mk | 6 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/rbe.mk b/core/rbe.mk index 91606d4004..19c0e4249a 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -34,6 +34,12 @@ 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 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 0c91a14c6f..c9e3e80590 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2021-02-05 + PLATFORM_SECURITY_PATCH := 2021-03-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |