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

Commit e4883786 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-8.1.0_r46' into staging/lineage-15.1_merge-android-8.1.0_r46 

Android 8.1.0 Release 46 (OPM6.171019.030.K1)

* tag 'android-8.1.0_r46':
  Updating Platform Security String to 2018-09-05 Bug: 111501777 (cherry picked from commit 6bc223c9)
  [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880 (cherry picked from commit f6bee62b)
  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: I42881615653bc13b438b10cedf2077ea9bea782b
parents aff4debc 6f135c94

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=OPM6.171019.030.H1
 
export BUILD_ID=OPM6.171019.030.K1

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

      PLATFORM_SECURITY_PATCH := 2018-09-05

endif



ifndef PLATFORM_BASE_OS