Commit Graph

909 Commits

Author SHA1 Message Date
Paul Scovanner
e7cb2e6c8a [DO NOT MERGE]
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
2021-09-17 18:59:56 +00:00
Sasha Smundak
9a9da6024c Move the stable code from version_defaults.mk to version_util.mk.
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054

Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
2021-09-13 15:50:20 -07:00
Anton Hansson
4c790761e7 Merge "Add new make variables for extension SDK version" into sc-dev-plus-aosp am: 18d6ad50c4 am: 51a5778483
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15684824

Change-Id: I65657f444b8ce92c548695a089147042a2631faa
2021-08-31 11:10:51 +00:00
Anton Hansson
2ea7e6ecad Add new make variables for extension SDK version
- PLATFORM_SDK_EXTENSION_VERSION is the sdk extension version of the
  tree
- PLATFORM_BASE_SDK_EXTENSION_VERSION is the sdk extension version that
  PLATFORM_SDK_VERSION ships with.

Also propagate PLATFORM_SDK_EXTENSION_VERSION to soong to that it can be
used in genrules.

Bug: 195281582
Test: via development/ CL in this topic
Change-Id: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
(cherry picked from commit ee524aa4f7bae2cc4d32eec3689aecf3e766dec4)
2021-08-27 17:42:15 +01:00
Presubmit Automerger Backend
331740b08f [automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7 am: 7c0923f9ec am: 0ca2960f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276

Change-Id: Ia6d6cb5ac0128c57a9a4efb4b6dd8031235f98c1
2021-08-26 01:36:01 +00:00
Presubmit Automerger Backend
7c0923f9ec [automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276

Bug: 193547118
Change-Id: Ie50456b3fc217af0b87677b5074c6225a407e808
2021-08-26 01:04:25 +00:00
Paul Scovanner
1f04c4d3e7 Revert "Update Security String to 2021-10-06"
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
2021-08-26 01:04:17 +00:00
Paul Scovanner
65b0781ed8 Merge changes from topic "presubmit-am-38a835692f314290aa45b4deba2bb3ab" into sc-dev-plus-aosp am: ae3f83ed65 am: eebd33bc9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633

Change-Id: I3e34c5ec25072bf21265b16027650df63c8572ab
2021-08-26 00:22:50 +00:00
Paul Scovanner
7ba6989f5d [automerge] Update Security String to 2021-10-06 2p: 61275cd338
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633

Bug: 193547118
Change-Id: Id8bd233e6f86d5499099ffdc980583cdb7b92cae
2021-08-25 20:24:46 +00:00
Paul Scovanner
61275cd338 Update Security String to 2021-10-06
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
2021-08-25 20:24:40 +00:00
Paul Scovanner
fb7158e010 Update Security String to 2021-10-05 am: 91cbb67645 am: 0005491f9b am: b4666d445d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362

Change-Id: I2480553b597ff09b968b87de60ee34cca279562b
2021-08-13 23:29:58 +00:00
Paul Scovanner
0005491f9b Update Security String to 2021-10-05 am: 91cbb67645
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362

Change-Id: If292a34576d46ba5582fc86a9a5d68b90ab58eb8
2021-08-13 23:00:30 +00:00
Paul Scovanner
91cbb67645 Update Security String to 2021-10-05
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 19:50:02 +00:00
Colin Cross
ca3dc5678f Update codename for sc-v2-dev to Sv2
Bug: 193674948
Test: treehugger
Change-Id: I0e7af15f58a2859ca938d01cff067700a85b7743
2021-08-04 23:50:56 +00:00
Colin Cross
a45d0c890e Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
2021-07-23 21:05:16 +00:00
Paul Scovanner
be8bf158f0 Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d am: 7df23ee7aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I709412b554a94bbecd8bc8ae71f86188ec932943
2021-06-30 23:04:35 +00:00
Paul Scovanner
7df23ee7aa Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I223dd4c0495601db35c400fdac944713b1d809a3
2021-06-30 22:52:04 +00:00
Paul Scovanner
cfd4896dc2 Update Security String to 2021-09-05
Bug: 192405736
Change-Id: Icea699ec7f82744ff0a6dca90068b2737129778a
2021-06-30 00:36:24 +00:00
Colin Cross
5e9ba92e05 Master is T
Bug: 186121492
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905
2021-06-15 13:31:59 +00:00
Jeff Sharkey
3159f8f31b [DO NOT MERGE] platform/build/make - S is now REL am: 25d421446d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214

Change-Id: Ibe070a1f81c5e6456bc57a0d24df470e608e2de7
2021-06-15 03:54:47 +00:00
Jeff Sharkey
4ef2e34cb5 Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev 2021-06-15 03:51:43 +00:00
Paul Scovanner
c57c536e09 Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff am: 073480991e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I022dde955d07bc828b55474008fe5ff4f0362d71
2021-06-14 22:02:19 +00:00
Paul Scovanner
073480991e Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Ifcfa2fd56abfd942b4af0a9a95e0150b95a0263f
2021-06-14 21:56:38 +00:00
Paul Scovanner
f5139e3087 Update Security String to 2021-08-05
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 18:53:26 +00:00
Jeff Sharkey
25d421446d [DO NOT MERGE] platform/build/make - S is now REL
Bug: 171506470
Test: Build
Change-Id: I98536ff83aab23cfaf5553a57a8a3b8264878847
2021-06-10 15:05:11 -06:00
Jeff Sharkey
2ec10e7543 Merge "platform/build/make - S is now 31" into sc-dev am: 83ecfb5073
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14748391

Change-Id: I68f42fbd7ef09dd357d010ac9a27272696414519
2021-06-02 20:14:08 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
2021-06-02 10:19:19 -06:00
Colin Cross
5ef69b1ed4 Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" am: 54b437286b am: e131ab1e10
Original change: https://android-review.googlesource.com/c/platform/build/+/1721370

Change-Id: I8ad39eb7f2ab075f60d03eb123392dc0488d9f72
2021-06-01 22:27:44 +00:00
Colin Cross
45efdc4e0e Support all active codenames for BOARD_SYSTEMSDK_VERSIONS
Use PLATFORM_VERSION_ALL_CODENAMES to construct PLATFORM_SYSTEMSDK_VERSIONS
so that both S and T are accepted while T is active but S is not finalized.

Bug: 186121492
Test: treehugger
Change-Id: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
2021-05-27 13:27:23 -07:00
Paul Scovanner
b8ae2c21e1 Update Security String to 2021-07-05 am: 64b00db8f4 am: e580c75611
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: Ie542698aef33599bf1e0d5315b58d2fcffada1d4
2021-05-19 22:42:09 +00:00
Paul Scovanner
64b00db8f4 Update Security String to 2021-07-05
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
2021-05-17 21:54:30 +00:00
Xin Li
7a2e4a990a DO NOT MERGE - Merge RQ2A.210505.003.
Bug: 187544653
Merged-In: Ica626a3b19e5b642807234c288428cd7e0f40f98
Change-Id: I3ff9da08d4c59e59a50bc89a6f962b185f8d3942
2021-05-07 18:51:09 -07:00
Bill Yi
21e8c35b78 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Merged-In: I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1
Merged-In: I9ae926913e3b6409e4b5ffff40ee72b2f42290ea
Change-Id: Icdb6feab48152418ee3e3d44a6d039225a11dbbf
2021-04-13 19:31:56 -07:00
Paul Scovanner
b862fdf0a8 Update Security String to 2021-06-05 am: deaeaecae3 am: 9c4bacfd42
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: I1d608ce127533022dc576b27ac0d5187894134b0
2021-04-13 18:06:45 +00:00
Paul Scovanner
deaeaecae3 Update Security String to 2021-06-05
Bug: 185154903
Change-Id: Ibfaf0bcc7e4525786eca62cafc7548030be40c61
2021-04-12 21:03:24 +00:00
Paul Scovanner
aa90271881 Update Security String to 2021-05-05
resolve merge conflicts of 321db2f846 to rvc-qpr-dev

Bug: 182937985
Change-Id: I248e89c967a3b02e072f477594a86b568d0f94a2
(cherry picked from commit 10e01bc865)
2021-03-18 23:59:31 +00:00
Paul Scovanner
12002c3c3b Update Security String to 2021-05-05 am: 10e01bc865
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13920445

Change-Id: Ida116e9a8a8bf3a4bee041e13b6dbc012c646667
2021-03-18 18:19:37 +00:00
Paul Scovanner
321db2f846 DO NOT MERGE
Update Security String to 2021-05-05

Bug: 182937985
Change-Id: Ica626a3b19e5b642807234c288428cd7e0f40f98
2021-03-17 20:26:59 +00:00
Xin Li
3f904dd415 Merge RQ2A.210305.007 into stage.
Bug: 180401296
Merged-In: I6d6542306c51ac1682f02cbce6701688d2bdbea2
Change-Id: I1c3a82d5c420fbb97e81379034947d35024b0925
2021-03-01 00:54:23 -08:00
Paul Scovanner
48c9d69a0f Update Security String to 2021-04-05
Bug: 179275902
Change-Id: Iac6942fe3ffb72e2ae1d1c4ea653d1bf9f4e89e9
(cherry picked from commit 1f4aeb1430)
2021-02-09 01:22:42 +00:00
Paul Scovanner
a0a34935d4 Update Security String to 2021-04-05 am: 1f4aeb1430
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13475466

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc4c77c981314eca34e38ea593eebff703c7d1b9
2021-02-06 00:38:34 +00:00
Paul Scovanner
1f4aeb1430 Update Security String to 2021-04-05
Bug: 179275902
Change-Id: Iac6942fe3ffb72e2ae1d1c4ea653d1bf9f4e89e9
2021-02-03 22:12:34 +00:00
Bill Yi
20f243849e Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I2978c6f188fa68ec283d3a46487e588f39a84924
Change-Id: I07badac5de201532ba52dc0b8fe77676b11e608a
2021-02-02 09:54:37 -08:00
Paul Scovanner
2ca855c5f5 Update Security String to 2021-03-05
Bug: 177091143
Change-Id: I6d6542306c51ac1682f02cbce6701688d2bdbea2
(cherry picked from commit 9c4665257c)
2021-01-15 00:28:05 +00:00
Paul Scovanner
67bbbadbdb Update Security String to 2021-03-05 am: 9c4665257c am: 6d2ae8eb03
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13305148

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5089375b0dedf25f3f381b8a64ed66f193dd5996
2021-01-11 19:53:40 +00:00
Paul Scovanner
9c4665257c Update Security String to 2021-03-05
Bug: 177091143
Change-Id: I6d6542306c51ac1682f02cbce6701688d2bdbea2
2021-01-08 21:53:54 +00:00
Bill Yi
831f195367 Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE
Merged-In: Iee612ad0f443d5ae9fa9e469785f304394b3d40c
Change-Id: I72e6c815753207ed776cc979db21a7b6ab167a82
2021-01-05 09:15:38 -08:00
Paul Scovanner
15a1226d7d Update Security String to 2021-02-05
Bug: 175313938
Change-Id: I6a1139d288c24a11289fc53c9022fd6d70acd8e6
(cherry picked from commit d4d46ab023)
2020-12-15 21:45:24 +00:00
Paul Scovanner
b316614965 Update Security String to 2021-02-05 am: d4d46ab023 am: 02819aefbd am: 4de5d521ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13202277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0297f88b04b297796086e4a67e7d33d4c27262b
2020-12-14 16:02:06 +00:00
Paul Scovanner
d4d46ab023 Update Security String to 2021-02-05
Bug: 175313938
Change-Id: I6a1139d288c24a11289fc53c9022fd6d70acd8e6
2020-12-10 18:23:46 +00:00