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

Unverified Commit 34fb6562 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

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

Android 8.1.0 release 52

* tag 'android-8.1.0_r52':
  [DO NOT MERGE] Update platform security string to 2018-12-05 bug: 117667960 (cherry picked from commit 7af38a13)
  [DO NOT MERGE] Update platform security String to 2018-12-01 bug:117667960 (cherry picked from commit b43ff9d8)

Change-Id: Ieb09dd3032de96a24b90217b4274fd6601629a21
parents b00da0f5 6fe7c539

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=OPM7.181105.004
 
export BUILD_ID=OPM7.181205.001

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

      PLATFORM_SECURITY_PATCH := 2018-12-05

endif



ifndef PLATFORM_BASE_OS