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

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

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

Android 9.0.0 release 35

* tag 'android-9.0.0_r35':
  Update Security String to 2019-04-05 Bug: 124119313 (cherry picked from commit 0b5a344d)
  Version bump to PQ2A.190405.002
  Version bump to PQ2A.190405.001
  Version bump to PQ2A.190401.002
  Version bump to PQ2A.190401.001
  Update Security String to 2019-04-01 Bug: 124119313 (cherry picked from commit f9835d9f)

Change-Id: Ib61349560ad4e8d43bc7f111eed2488540598076
parents 96c8be54 de4669b4

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=PQ2A.190305.002
 
export BUILD_ID=PQ2A.190405.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-03-05

      PLATFORM_SECURITY_PATCH := 2019-04-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP