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

Commit 9b627eb4 authored by Sam Mortimer's avatar Sam Mortimer
Browse files

Merge tag 'android-8.1.0_r30' into lineage-15.1 

Android 8.1.0 release 30

* tag 'android-8.1.0_r30':
  DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05
  Version bump to OPM2.171026.006
  Version bump to OPM2.171026.005
  Version bump to OPM2.171026.004
  Update Security String to 05-05 on release branch (cherry picked from commit 15d6d5502cb5eb2b2054c8baecadccc4422854c9)
  DO NOT MERGE Updating security string for oc-dev to 2018-05-01

Change-Id: Ib5a40349a68572db21613ca441cda87a37390b30
parents f67b801a 56e105a0

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.171019.029.B1
 
export BUILD_ID=OPM2.171026.006.C1

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-05-05

      PLATFORM_SECURITY_PATCH := 2018-06-05

endif



ifndef PLATFORM_BASE_OS