aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin F. Haggerty <haggertk@lineageos.org>2019-05-10 15:28:39 (GMT)
committerKevin F. Haggerty <haggertk@lineageos.org>2019-05-10 15:29:06 (GMT)
commitdb1fddcef86ef1153b729533d55a7b9b0dfea8f1 (patch)
treea6724947e8464fdf2291cfdf0e1660d17fe07589
parent87e92211028dafbc7359dddf4d7c2c1ee0c501ff (diff)
parent9f4db7673b2bf2bdcfd76c58cceca3eac2c0c622 (diff)
downloadandroid_build-db1fddcef86ef1153b729533d55a7b9b0dfea8f1.zip
android_build-db1fddcef86ef1153b729533d55a7b9b0dfea8f1.tar.gz
android_build-db1fddcef86ef1153b729533d55a7b9b0dfea8f1.tar.bz2
Merge tag 'android-9.0.0_r37' into staging/lineage-16.0_merge-android-9.0.0_r37HEADlineage-16.0refs/changes/06/247606/2
Android 9.0.0 Release 37 (PQ3A.190505.002) * tag 'android-9.0.0_r37': Version bump to PQ3A.190505.002 [DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951 (cherry picked from commit 7d44fc8d59547bc583bad61fe2cae9fa14d31baf) [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev Bug: 128322951 (cherry picked from commit 1159bb8b17df6caf1ce075d120c811b17eb73554) Version bump to PQ3A.190220.002 [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev Bug:124119313 Update Security String to 2019-04-05 Bug: 124119313 Update Security String to 2019-04-01 Bug: 124119313 Version bump to PQ3A.190122.001 [DO NOT MERGE] Update Platform Security String to 2019-03-05 for oc-mr1-dev Bug:122541777 [DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777 [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 Update Platform Security String to 2019-03-05 for pi-dev Bug:122541777 Update Platform Security String to 2019-03-01 for pi-dev Bug:122541777 [DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419 [DO NOT MERGE] Security String update to 2019-02-01 Bug: 120144419 [DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419 [DO NOT MERGE] Security String update to 2019-02-01 Bug: 120144419 Change-Id: Id9ec8ccc87eeb9c4e434c18ffbe4e52c8c98afa0
-rw-r--r--core/build_id.mk2
-rw-r--r--core/version_defaults.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 94db136..4c46c5c 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=PQ2A.190405.003
+export BUILD_ID=PQ3A.190505.002
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 1df6fc5..80e5007 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -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-04-05
+ PLATFORM_SECURITY_PATCH := 2019-05-05
endif
ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP