Commit graph

1017 commits

Author SHA1 Message Date
Joe Onorato
6d7afa00e3 Make RELEASE_PLATFORM_VERSION a release config flag to set platform version.
Bug: 282838389
Test: Treehugger
Merged-In: Ic6dacbdee7d2408aa8b25b4df59bf9bbc566d747
Change-Id: Ie61a7d986c2b8fe2c16117f6678b9e5a71711647
2023-06-11 09:17:43 -07:00
Bill Yi
2aa8d8eadf Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE
Merged-In: Iec0d67abed7e0d53976e663ca8f4d497a33199e8
Merged-In: Ie6c40c596af6da2c2af8368c5efa5bf907c5479a
Merged-In: I264df2b5a111cf9ce4fe8d5f9f36d2fa39de5d6f
Change-Id: Ib7a4ac5e08f6ce1683c674219996bfc65dda6fce
2023-05-03 22:34:46 +00:00
Colin Cross
d69b64d33f Update PLATFORM_VERSION to VP1A
Update PLATFORM_VERSION to VP1A.  The codename is now VanillaIceCream.

Bug: 279492191
Test: m checkbuild
Change-Id: Ibc24c10cf040407d79662c1819beaf97da791efb
Merged-In: Ibc24c10cf040407d79662c1819beaf97da791efb
2023-04-24 14:28:13 -07:00
Xin Li
c350dd238e Merge TQ2A.230405.003
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
2023-04-11 00:00:10 -07:00
Dan Albert
2549214184 Acknowledge V in AOSP.
Development of V APIs has started, so we need to add the codename to
the build system so API developers can use it.

Bug: None
Test: treehugger
Change-Id: Ic7e77cbc9992d7a0d2959abc42ce2862232317ca
2023-03-28 23:25:45 +00:00
Steve Berbary
7f02771151 Update Security String to 2023-05-05
Bug: 272844037
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be772485c3cd1693cedb404114d2d0de4d21e492)
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-28 18:41:22 +00:00
Xin Li
95bbef8402 Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Change-Id: I0cf59fc2635e8d951da0bbeced842f92c3d5b655
2023-02-14 16:13:00 -08:00
Steve Berbary
b1bdb64c74 Update Security String to 2023-04-05
Bug: 268558932
Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
(cherry picked from commit c29c047fd1)
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
2023-02-14 18:15:34 +00:00
Steve Berbary
d7834084dd Update Security String to 2023-03-05
Bug: 265319238
Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
(cherry picked from commit 465700df39)
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-17 20:07:54 +00:00
Steve Berbary
1c8baeee29 Update Security String to 2023-02-05 am: 79e595f4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665950

Change-Id: I0ccfc13d0e98ea3b06c57011a580418ee89ea433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 19:31:06 +00:00
Steve Berbary
79e595f4e3 Update Security String to 2023-02-05
Bug: 261738635
Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-07 19:17:24 +00:00
Steve Berbary
d329599272 Update Security String to 2023-01-05 am: 6e30aeea16
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20439524

Change-Id: Ie43be7da63458b83e94ad5a1e54df14b2d43a11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 21:49:22 +00:00
Steve Berbary
6e30aeea16 Update Security String to 2023-01-05
Bug: 258811679
Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1
2022-11-11 18:05:20 +00:00
Steve Berbary
d563878a12 Update Security String to 2022-12-05 am: a12157186b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112471

Change-Id: I658d89210c68ebb7d083c23c5f6182e8e20c48c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 21:48:22 +00:00
Steve Berbary
a12157186b Update Security String to 2022-12-05
Bug: 250644806
Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442
2022-10-04 18:44:49 +00:00
Treehugger Robot
a0b9c8e4fd Merge "Simplify PLATFORM_BASE_SDK_EXTENSION_VERSION" am: c017139559 am: db7323424f
Original change: https://android-review.googlesource.com/c/platform/build/+/2220921

Change-Id: I52fb44ed4d44a6acafe9b2ea3adbb90eb4f08e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:28:27 +00:00
Mårten Kongstad
26ed749f14 Simplify PLATFORM_BASE_SDK_EXTENSION_VERSION
Make PLATFORM_BASE_SDK_EXTENSION_VERSION default to
PLATFORM_SDK_EXTENSION_VERSION: they only need to be different on the
SDK extension branches.

Bug: 247413701
Test: manual install of modules
Change-Id: Iedcd9d6bce4e7346d24146b871d489255a17466c
Merged-In: Iedcd9d6bce4e7346d24146b871d489255a17466c
2022-09-20 15:42:11 +02:00
Steve Berbary
2d2b1cc430 Update Security String to 2022-11-05 am: 831521e2fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19909611

Change-Id: I076ff191784a76ca0cfbec6472623516dc22e14f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 17:57:59 +00:00
Steve Berbary
831521e2fe Update Security String to 2022-11-05
Bug: 244460991
Change-Id: If6c0dc2d69b70f9722da0950582aa5acf224c0fe
2022-09-09 19:25:16 +00:00
Bill Yi
f5b2125970 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE
Merged-In: I01b00f2284583d775dc81a91e20410c1d37cc91c
Merged-In: I40dc7e8c108c4d2398c95ddb6f2acafc2362efee
Change-Id: I457aa1030049007f881b31fa84e9d049b27eaed3
2022-09-08 14:27:58 -07:00
Steve Berbary
e01df6fce7 Update Security String to 2022-10-05 am: 763c03967e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096

Change-Id: Ic17372e81b55d5c345a5656e7be7f72b2cbc1242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 20:59:26 +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
870b7f37b3 Update Security String to 2022-09-05
Bug: 238435977
Change-Id: Ibcc1999668338bdfa888c52d3e3a0ccb6b0bf5e1
(cherry picked from commit d041329fa0)
Merged-In: Ibcc1999668338bdfa888c52d3e3a0ccb6b0bf5e1
2022-07-29 22:34:55 +00:00
Paul Scovanner
c924558896 Update Security String to 2022-09-05 am: d041329fa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19429477

Change-Id: Id39525ce87fb47b36e4cc74ceb3f92f9624e4769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 19:43:20 +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
455ec3075a Update Security String to 2022-08-05 am: 9f2be867c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18911707

Change-Id: I11c9815c01461fb331e068ca55b2eca4c160a06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:07:04 +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
Colin Cross
3a445abd76 Remove Tiramisu codename from branches downstream of tm-dev
Tiramisu has been finalized in tm-dev, remove the codename from
branches downstream of tm-dev.

Bug: 225745567
Test: treehugger
Change-Id: I12d5a0d018cd8a7dc53136dc67cd23b78b56d55a
2022-06-08 10:04:42 -07:00
Steve Berbary
5fa9538fa3 Update Security String to 2022-07-05 am: e359b90082 am: 4dba876f41
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356643

Change-Id: Id4983957783d3d21d04ff853ed833ce645124373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:17:08 +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
Colin Cross
7fd1802cbd Update PLATFORM_VERSION to UP1A
Update PLATFORM_VERSION to UP1A.  The codename is now UpsideDownCake.

Bug: 219519679
Test: m checkbuild
Change-Id: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
(cherry picked from commit 29919e3b66)
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
2022-04-22 18:56:56 +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