Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2ec711a authored by Xin Li's avatar Xin Li
Browse files

Merge RQ2A.210305.007 

Bug: 180401296
Merged-In: Ifc7f272e273f54df843650e7e74fcad40a76994a
Change-Id: I7a08adbca4a7f82be6e56c9ccb88b0ea7d5fc139
parents 36c1435e 7e3f5430

core/rbe.mk

+6 −0
Original line number Diff line number Diff line
@@ -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

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -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