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

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

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

Android 8.1.0 Release 50 (OPM7.181105.004)

* tag 'android-8.1.0_r50':
  Version bump to OPM7.181105.004
  Version bump to OPM7.181105.003
  [DO NOT MERGE] Update platform security string to 2018-11-05 on oc-mr1-dev bug:114110585 (cherry picked from commit 281cb3b1)
  Version bump to OPM7.181105.001
  [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev Bug:114110585 (cherry picked from commit b703503c)

Change-Id: Id6bf362e3913d6e0abb297307254ccd95c418dca
parents f6ae8413 4efd5f70

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

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

      PLATFORM_SECURITY_PATCH := 2018-11-05

endif



ifndef PLATFORM_BASE_OS