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

Commit 35ffd201 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge tag 'android-8.1.0_r36' into staging/lineage-15.1-android-8.1.0_r36 

Android 8.1.0 Release 36 (OPM2.171026.006.H1)

* tag 'android-8.1.0_r36':
  DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev Bug:79883349 (cherry picked from commit cfbe84b8)
  DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05

Change-Id: If99e4adeba19295ec9b8d33e21b4e4a841b63c3a
parents 0e247f2c c455ebfe

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=OPM2.171026.006.C1
 
export BUILD_ID=OPM2.171026.006.H1

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,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 := 2018-06-05

      PLATFORM_SECURITY_PATCH := 2018-07-05

endif



ifndef PLATFORM_BASE_OS