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

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

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

Android 8.1.0 release 47

* tag 'android-8.1.0_r47':
  Version bump to OPM7.181005.003
  Version bump to OPM7.181005.002
  DO NOT MERGE Update platform security string to 2018-10-05 bug:112535135 (cherry picked from commit 090027fb)

Change-Id: I6dfbdfcddde32908e8f9054d4a35237b9cda9d68
parents e4883786 625affad

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

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

      PLATFORM_SECURITY_PATCH := 2018-10-05

endif



ifndef PLATFORM_BASE_OS