Commit graph

991 commits

Author SHA1 Message Date
Steve Berbary
831521e2fe Update Security String to 2022-11-05
Bug: 244460991
Change-Id: If6c0dc2d69b70f9722da0950582aa5acf224c0fe
2022-09-09 19:25:16 +00:00
Steve Berbary
763c03967e Update Security String to 2022-10-05
Bug: 242323332
Change-Id: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db
2022-08-16 03:39:28 +00:00
Paul Scovanner
d041329fa0 Update Security String to 2022-09-05
Bug: 238435977
Change-Id: Ibcc1999668338bdfa888c52d3e3a0ccb6b0bf5e1
2022-07-27 21:53:45 +00:00
Bassem Khalife
9f2be867c4 Update Security String to 2022-08-05
Bug: 232157623
Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-15 21:58:56 +00:00
Steve Berbary
4dba876f41 Update Security String to 2022-07-05 am: e359b90082
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356643

Change-Id: I79b195940e52d9ec1b6c8fa77b63b880a7b1a894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:43 +00:00
Steve Berbary
e359b90082 Update Security String to 2022-07-05
Bug: 231380374
Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd
2022-05-12 18:49:14 +00:00
Yurii Zubrytskyi
f1687f9848 RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL
Bug: 225745567
Test: Build
Change-Id: I9efa0b919e15bb2f55054ae0d59f53f572ba87cd
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
2022-05-02 23:16:08 +00:00
Yurii Zubrytskyi
97191b2095 platform/build/make - T is now 33
Bug: 225745567
Test: Build
Change-Id: If115998c2ef9ef58329faa937e11d673f5585aab
2022-04-12 12:47:25 -07:00
TreeHugger Robot
97ca005658 Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp am: 31d5f5bb57
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615283

Change-Id: Iee3240448514a7486bbc66427f6bd5bfdb045af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 19:37:43 +00:00
Steve Berbary
1e8f7167b5 [automerge] Update Security String to 2022-06-05 2p: ed13206d0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615283

Bug: 228265025
Change-Id: I5791d7f0ef46c5c21f17f653f529650a69e5cdd1
2022-04-06 05:02:45 +00:00
Steve Berbary
ee052ac0e5 Update Security String to 2022-06-05
Bug: 228265025
Change-Id: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
2022-04-06 05:02:41 +00:00
Artur Satayev
caad215a98 Merge "Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES." into tm-dev 2022-03-21 13:45:09 +00:00
TreeHugger Robot
e160b616c6 Merge "DO NOT MERGE: Set display version for T" into tm-dev 2022-03-18 20:08:48 +00:00
satayev
da1e41d1f3 Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES.
Bug: 220153433
Test: atest BuildTest
Change-Id: I24d73a846d14a032c1e03679cef10cfeac814bb9
2022-03-16 14:31:01 +00:00
Steve Berbary
a80c97f835 Merge changes from topic "presubmit-am-af5ea525ca0b47719063253a628cb9f4" into sc-v2-dev-plus-aosp am: e4abae8a45
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17126794

Change-Id: Id09eef04aee25690a8b28afb5b925dd78df6d35e
2022-03-14 22:12:32 +00:00
Steve Berbary
a492541a8d [automerge] Update Security String to 2022-05-05 2p: 825ae00092
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17126794

Bug: 223313197
Change-Id: I9044bd87ee243d4bf06b56bad9c3a6cc4dc8ca87
2022-03-14 18:13:09 +00:00
Steve Berbary
825ae00092 Update Security String to 2022-05-05
Bug: 223313197
Change-Id: I5a35451e14cba5f115ab66926d62c4fa4556a267
2022-03-14 18:12:54 +00:00
Anton Hansson
341915b0f5 Bump the base sdk extension version in TM
T will ship with extension version 2 (probably 3, actually, but
definitely not 1), so bump the base extension version.

Bug: 222049920
Test: m nothing
Change-Id: I9a718a514e64c2fa6795a3512af6528e177ede17
2022-03-14 13:08:40 +00:00
Anton Hansson
f5dfe3ff7b Bump SDK Extension version to 2
This bump includes SdkExtensions and MediaProvider.

Bug: 222049920
Test: Manual install of MP & SDKExtensions
Change-Id: Ie68b78c93f66bd7b40f0dad301821d14d8dc5655
2022-03-14 10:35:04 +00:00
Colin Cross
e8e5f96581 DO NOT MERGE: Set display version for T
Bug: 221950960
Test: manual
Change-Id: I76ef1fa3d48b8ab5343a093ff095f7a42732df9a
2022-03-07 21:24:39 +00:00
Colin Cross
ae4550ecd6 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135 am: 552c2d1c81 am: 400a979b88
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: Ib3921c70e5ba472126c9579d0ec3db3111a04635
2022-03-02 00:55:39 +00:00
Colin Cross
400a979b88 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135 am: 552c2d1c81
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I184be6d3aa140d09d5c7e83c8b242fca704ebc38
2022-03-02 00:34:34 +00:00
Colin Cross
552c2d1c81 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I06dd0a5eef6a5dd16b1fd4b2d845d0de2ef088c9
2022-03-02 00:13:01 +00:00
Colin Cross
a492544a03 Add PLATFORM_DISPLAY_VERSION
Add PLATFORM_DISPLAY_VERSION to version_defaults.mk that will propagate
to the ro.build.version.release_or_preview_display property and
be shown as the Android version for preview releases by Settings.

Bug: 221950960
Test: manual
Change-Id: I697cc59f77f92aa98a8a2573662797e6d3bd2042
2022-02-28 18:01:35 -08:00
Xin Li
4455b0dc97 Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:31:18 +00:00
Artur Satayev
e4814b895b Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a am: 206f023938 am: f20c233bad
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: I2360bda8d8cc85e759f7870dea0ef09753551f5d
2022-02-14 12:59:22 +00:00
Artur Satayev
f20c233bad Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a am: 206f023938
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: Ie7320298cd0c1fa511e2174e13fe4f34fe1e8ac5
2022-02-14 12:43:40 +00:00
Bassem Khalife
bc8d3620db Update Security String to 2022-04-05 am: 41a3269dd6 am: 6c815b28f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742828

Change-Id: I173a0b5da680b11694c0b6148be02867919c0e15
2022-02-12 02:06:38 +00:00
Bassem Khalife
6c815b28f9 Update Security String to 2022-04-05 am: 41a3269dd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742828

Change-Id: Ia3b5d968b608239a114ebb9ea844386c7f0eb98d
2022-02-12 01:55:19 +00:00
satayev
2d94586cff Introduce ro.build.version.known_codenames sysprop.
It defines values for Build.VERSION.KNOWN_CODENAMES constant, and should
contain all codenames starting from Q, including current codename
for in development branches.

Bug: 211747008
Test: presubmit
Change-Id: If8995750e369ba39bfc7041580c21b2f96632a78
2022-02-11 13:20:49 +00:00
Bassem Khalife
41a3269dd6 Update Security String to 2022-04-05
Bug: 216579780
Change-Id: Ia4661819b2f7ad4cef86d026c97ce07c3be8e005
2022-02-10 06:19:50 +00:00
Xin Li
849ad3ba72 Merge SQ1A.220205.002
Bug: 213904741
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
Change-Id: I880096a3272bb9ae5b95e7f9b507b464b5aec856
2022-02-07 23:16:55 -08:00
Bassem Khalife
8c4f3da837 Update Security String to 2022-03-05 am: 16caffd2e7 am: aaf39a53f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579303

Change-Id: I6f2d1853df6bb1c98782c8285e25cc0e10132d9c
2022-01-15 16:49:25 +00:00
Bassem Khalife
aaf39a53f9 Update Security String to 2022-03-05 am: 16caffd2e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579303

Change-Id: If37e38c997ad736b84326bff4d83bc0bc5d4066e
2022-01-15 16:37:59 +00:00
Bill Yi
5a77fbf008 Merge sc-qpr1 to aosp-master - DO NOT MERGE
Merged-In: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
Merged-In: I71f542d511cf6397d84d40b1fb688c307cdd386e
Change-Id: Id5d2b7b2b18ae1a1919a53121c06fb309e5b2eee
2022-01-06 18:38:30 -08:00
Bassem Khalife
16caffd2e7 Update Security String to 2022-03-05
Bug: 211820647
Change-Id: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863
2022-01-07 00:50:18 +00:00
Xin Li
90df2b43bc Merge SP1A.211205.008
Bug: 205056467
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
Change-Id: Ic9d5fe40d265ef8002ccbcf3182a2fb8b6239135
2021-12-20 14:07:52 -08:00
Bassem Khalife
d8f5cca134 Update Security String to 2022-02-05
Bug: 210005927
Change-Id: I89893ac32691d46c911c387d3f4c41f229cd33c0
2021-12-20 14:55:35 +00:00
Bassem Khalife
52b2c3458f Update Security String to 2022-02-05
Bug: 210005927
Change-Id: I689fb7c1bc77e6e0de442d1bb3a7ce6fee899f98
2021-12-17 23:30:51 +00:00
Bassem Khalife
1babda1463 Update Security String to 2022-02-05
Bug: 210005927

Change-Id: I8b7a5dea105d34a7fa987ddb44e94d6f8c94c7cc
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
2021-12-16 22:55:27 +00:00
Bassem Khalife
d8c520303c [DO NOT MERGE]
Update Security String to 2022-02-05
   
 Bug: 210005927

Change-Id: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
(cherry picked from commit fdbbcabca3)
Merged-In:Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
2021-12-15 00:01:07 +00:00
Bassem Khalife
05bc7a1d9d Update Security String to 2022-01-05
Bug: 207022948

Change-Id: Icec6bde7de35a844d520d6450b5a2562335591aa
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-12-04 17:29:06 +00:00
Bassem Khalife
000ad3cf5a Update Security String to 2022-01-05
Bug: 207022948

Change-Id: I972415a976bee96d1f93fb547bb5ae5323807516
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-30 00:19:17 +00:00
Paul Scovanner
e04aaf2f4c [DO NOT MERGE]
Update Security String to 2022-01-05

Bug: 207022948
Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
(cherry picked from commit 9e20227ea5)
Merged-In:Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-24 23:20:37 +00:00
Bassem Khalife
ea4df1b901 Update Security String to 2022-01-05
Bug: 207022948

Change-Id: If34c71239a446a49d4521116a35b28418cfcd350
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-24 00:23:30 +00:00
Michael Wright
51617538f0 Merge "Revert back to 12 instead of 12L" into sc-v2-dev-plus-aosp am: ce80edb3f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16264924

Change-Id: I1860da5971d73861f05ffc6934b1e791322ae254
2021-11-16 13:06:22 +00:00
Michael Wright
32d117dd52 S V2 is now REL
Bug: 204295952
Test: N/A
Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4
Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4
2021-11-15 23:39:36 +00:00
Michael Wright
5be855c250 Revert platform version to 12
Bug: 204295952
Test: N/A
Change-Id: I899af9326e95b4fcfb778f84b748f56834d54ca8
Merged-In: I7f87d189030e97f47dc81b756d1397b4aa65daf0
2021-11-15 23:39:26 +00:00
Michael Wright
42f68fbf39 Revert back to 12 instead of 12L
Bug: 206132499
Bug: 204295952
Test: N/A
Change-Id: I7f87d189030e97f47dc81b756d1397b4aa65daf0
2021-11-15 21:23:01 +00:00
Michael Wright
65a7e5e2bd S V2 is now REL
Bug: 204295952
Test: N/A
Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4
Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4
2021-11-11 19:21:48 +00:00