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

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

Merge tag 'android-9.0.0_r40' into staging/lineage-16.0_merge-android-9.0.0_r40 

Android 9.0.0 release 40

* tag 'android-9.0.0_r40':
  Version bump to PQ3A.190605.003 [core/build_id.mk]
  Version bump to PQ3A.190605.002
  Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4 (cherry picked from commit 3ae4e858)
  [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 (cherry picked from commit 2db03695)

Change-Id: If2089879676ef3a333bc1de29a82ffac86dda784
parents 4b624201 cf860f2a

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=PQ3A.190505.002
 
export BUILD_ID=PQ3A.190605.003

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,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 := 2019-05-05

      PLATFORM_SECURITY_PATCH := 2019-06-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP