Xin Li
68b4fefd60
Merge SP1A.210812.016
...
Merged-In: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
Change-Id: I4777de3e09216497b88f6916f8a5997e4cd10743
2021-09-28 19:25:30 +00:00
Colin Cross
177cbf600d
Update build_id.mk and version_defaults.mk for SC QPR1
...
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".
Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:34:43 -07:00
Paul Scovanner
1509179e5b
[DO NOT MERGE]
...
Update Security String to 2021-11-05
Bug: 199784479
Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
Merged-In: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
2021-09-17 21:52:39 +00:00
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
Presubmit Automerger Backend
541828d6f0
[conflict] [DO NOT MERGE] 2p: 0449bb97fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
2021-09-16 13:20:30 +00:00
Paul Scovanner
0449bb97fa
[DO NOT MERGE]
...
Update Security String to 2021-11-05
Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 11:39:07 +00:00
Sasha Smundak
cda1f3768f
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-15 16:12:05 -07:00
Paul Scovanner
948f7fa552
Update Security String to 2021-11-05
...
Bug: 199784479
Change-Id: I93db0c1fa9fbf42223fa2be0d6859bb22d1abac4
2021-09-14 23:27:05 +00:00
Sasha Smundak
1d7923e7d8
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-14 08:53:10 -07: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
Sasha Smundak
0447622dc3
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.
Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
2021-09-07 11:27:56 -07:00
Anton Hansson
9b8082c2d4
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
Merged-In: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
(cherry picked from commit ee524aa4f7bae2cc4d32eec3689aecf3e766dec4)
2021-08-31 17:41:56 +00: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
f0e17b7b9e
[automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7
am: bbb758b783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276
Change-Id: I6719b3a57e58152bfbbb05d04384448f106f5516
2021-08-26 01:18:33 +00:00
Paul Scovanner
3aa50b02bc
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
(cherry picked from commit 1f04c4d3e7
)
2021-08-26 01:11:18 +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
8125e52dd7
[automerge] Update Security String to 2021-10-06 2p: 61275cd338
am: 5f9af61fc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633
Change-Id: Icc115e93811d7ab1e24ae4151c3f74945435073b
2021-08-26 00:06:40 +00:00
Paul Scovanner
757dc6997a
Update Security String to 2021-10-06
...
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
(cherry picked from commit 61275cd338
)
2021-08-25 23:35:47 +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
e7a10a29da
Update Security String to 2021-10-05
...
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
(cherry picked from commit 91cbb67645
)
2021-08-17 22:53:48 +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
6480bac205
Update Security String to 2021-10-05 am: 91cbb67645
am: 4d57439ca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362
Change-Id: I40349f5ed8acd7d7293c3d041c58d81b6f2b4371
2021-08-13 23:25:07 +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
b3c7b25df4
Remove S codename from sc-v2-dev
...
S was finalized, it shouldn't be listed as an active codename any
more.
Bug: 193674948
Test: treehugger
Change-Id: I4cce94b0ea4865a5248ab106edce8fa165390005
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
2021-08-04 16:55:50 -07: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
2a69b486cf
Update codename for sc-v2-dev to Sv2
...
Bug: 193674948
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: I0e7af15f58a2859ca938d01cff067700a85b7743
2021-08-04 12:50:25 -07: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
32a8473026
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: I4f45e7bc32b914285c02f939872efcf77c53f1da
2021-06-30 23:05:32 +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