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

Commit 6e8a1266 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge tag 'android-9.0.0_r30' into lineage-16.0-android-9.0.0_r30 

Android 9.0.0 Release 30 (PQ1A.190105.004)

* tag 'android-9.0.0_r30':
  Version bump to PQ1A.190105.004
  Version bump to PQ1A.190105.003
  [DO NOT MERGE] Security string update to 2019-01-05 bug:118903919 (cherry picked from commit 81632342)
  Version bump to PQ1A.190105.001
  [DO NOT MERGE] Security string update to 2019-01-01 bug:118903919 (cherry picked from commit 1ce690dd)

Change-Id: Id19b58d156abebb87fd06aeba0d840b451fb4ddd
parents 7a7d8911 29aa0104

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=PQ1A.181205.006
 
export BUILD_ID=PQ1A.190105.004

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 := 2018-12-05

      PLATFORM_SECURITY_PATCH := 2019-01-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP