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

Commit 238f876e authored by Luca Stefani's avatar Luca Stefani
Browse files

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

Android 9.0.0 Release 31 (PQ2A.190205.001)

* tag 'android-9.0.0_r31':
  [DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419 (cherry picked from commit a9c8e616)
  [DO NOT MERGE] Security String update to 2019-02-01 Bug: 120144419 (cherry picked from commit 14b4156d)
  Version bump to PQ2A.181115.005
  Version bump to PQ2A.181115.004
  Version bump to PQ2A.181115.002
  [DO NOT MERGE] Security string update to 2019-01-05 bug:118903919
  [DO NOT MERGE] Security string update to 2019-01-01 bug:118903919
  Version bump to PQ2A.181016.002
  [DO NOT MERGE]Update Security String to 2018-12-05 for December release bug: 117667960
  [DO NOT MERGE] Update Security String to 2018-12-01 for December Release bug:117667960
  [DO NOT MERGE] Update platform security string to 2018-12-05 bug: 117667960
  [DO NOT MERGE] Update platform security String to 2018-12-01 bug:117667960
  [DO NOT MERGE] Update platform security string to 2018-11-05 on oc-mr1-dev bug:114110585
  [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev Bug:114110585
  Update platform security string to 2018-11-05 on pi-dev & master Bug:114110585
  Update platform security string to 2018-11-01 on pi-dev & master Bug:114110585
  [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move
  [RESTRICT AUTOMERGE] Remove build/libs

Change-Id: I5c224bd8edea3f462ae92cfa815d606b0ac574b3
parents 7fd7d37a a8542510

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.190105.004
 
export BUILD_ID=PQ2A.190205.001

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

      PLATFORM_SECURITY_PATCH := 2019-02-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP