Commit graph

1105 commits

Author SHA1 Message Date
Xin Li
5cca3caa48 Merge UP1A.231005.007
Bug: 291102124
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Change-Id: I4a0d6dfe3a5b4642f5c4cdf257c84c1634888699
2023-09-27 16:08:15 -07:00
Xin Li
3a846b926f Merge UP1A.230905.019
Merged-In: Ia5208702fc02d0e1ab53d1affc664363fba74a67
Change-Id: I7ba769565b1dbf56d6e00d85c87b7235b14a857a
2023-08-31 12:08:31 -07:00
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -07:00
Lokesh Kumar Goel
c94178c9f6 Update Security String to 2023-10-05
Bug: 295937899
Ignore-AOSP-First: Internal first as its needed for preparing the release
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bb28383f498c2602ca2e9bd1c686523882d384a1)
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Change-Id: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
2023-08-22 02:11:01 +00:00
Alex Buynytskyy
1f9fe102a4 Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main am: 7109fe1822
Original change: https://android-review.googlesource.com/c/platform/build/+/2657941

Change-Id: I1c6fee0ce48bcecfe07d1e8f236629cfd8360da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:14:25 +00:00
Alex Buynytskyy
7109fe1822 Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main 2023-08-16 21:27:21 +00:00
Bassem Khalife
6741c842cf Update Security String to 2023-09-05
Bug: 289414927
Ignore-AOSP-First: Future release prep (Internal first)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:838fbc4dd7190468ad68b92e3cb7b56fe7f3625f)
Merged-In: Ia5208702fc02d0e1ab53d1affc664363fba74a67
Change-Id: Ia5208702fc02d0e1ab53d1affc664363fba74a67
2023-07-18 04:29:52 +00:00
Joe Onorato
89f17ef427 Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL
Bug: 282843732
Test: get_build_var PLATFORM_VERSION_CODENAME
Change-Id: I16b9cf4ec8f395ceb192e35c18850fdab0a47df3
2023-07-14 14:18:08 -07:00
Bill Yi
49e6f615a6 Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
Merged-In: Ib0eee7237c81e43fe55da0c8569752e956891730
Merged-In: I1e276e220afe3c0c174a9822b0dce2a923be7b5c
Merged-In: I8c8a4079974ee9e1009483350ab24f790471da9e
Change-Id: I3b31eb8f5c003cb3fc7766e0a8d3378747304943
2023-07-11 15:35:47 -07:00
Lokesh Kumar Goel
00246a4c8d Update Security String to 2023-08-05 am: be93b44331 am: 8f4fa29b84
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23556019

Change-Id: Iff50cdb189b240ace80d3677df1d78d1423cbdfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:05:47 +00:00
Lokesh Kumar Goel
8f4fa29b84 Update Security String to 2023-08-05 am: be93b44331
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23556019

Change-Id: Idfa7e5dd2ed1f34e231ecda93d903b1692f1bdb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:32:02 +00:00
Lokesh Kumar Goel
91183a7c54 Update Security String to 2023-08-05 am: be93b44331
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23556019

Change-Id: I8098f2a65f8e7b3d8aa42aefe4aa98cdaaaf5ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:30:56 +00:00
Joe Onorato
ed951095cd Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d28 am: 4792be7660 am: 283db3fb83
Original change: https://android-review.googlesource.com/c/platform/build/+/2621452

Change-Id: I59742ac2ffa309d7cfd9a236546bba545124c89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:31:00 +00:00
Joe Onorato
283db3fb83 Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d28 am: 4792be7660
Original change: https://android-review.googlesource.com/c/platform/build/+/2621452

Change-Id: I8176e3f2a6557aabb750166008138a48612d5282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 03:44:49 +00:00
Joe Onorato
4792be7660 Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d28
Original change: https://android-review.googlesource.com/c/platform/build/+/2621452

Change-Id: I6428f2094cc9c14fdcc964997730d469038c38b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 03:06:16 +00:00
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
Lokesh Kumar Goel
be93b44331 Update Security String to 2023-08-05
Bug: 285692955
Change-Id: I137506c673d9f44789c26f88a416c0fd06df02ce
Ignore-AOSP-First: Future release prep (Internal first)
2023-06-05 05:07:45 +00:00
Steve Berbary
fecfd0e585 Update Security String to 2023-07-05
Bug: 282371465
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d6c119bfaa2b768070bda5e0d9c71806d83b7e39)
Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-27 17:11:57 +00:00
Steve Berbary
e4783d4b7a Update Security String to 2023-07-05 am: d6c119bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Change-Id: I32253c6815cc77d3c1a5dea63bde576a8deb900c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 01:21:05 +00:00
Steve Berbary
ef23512feb [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b 2p: 39c2792c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Bug: 282371465
Change-Id: I7128e082a505c0748b579dc775bfa1628effb3ec
2023-05-13 22:22:41 +00:00
Steve Berbary
39c2792c7a [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Bug: 282371465
Change-Id: I65abe1a7045cfef8bcb3dfd454a168aef7e73471
2023-05-13 22:22:32 +00:00
Steve Berbary
d6c119bfaa Update Security String to 2023-07-05
Bug: 282371465
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-13 22:22:23 +00: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
e9f67b7fcc Merge "Update PLATFORM_VERSION to VP1A" am: 0697b9bb6e
Original change: https://android-review.googlesource.com/c/platform/build/+/2556030

Change-Id: Ia80957a81eeaea579a35ebf54c8b8ed5f374e9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:45:59 +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
Colin Cross
4d3070c6ee Update PLATFORM_VERSION to VP1A
Update PLATFORM_VERSION to VP1A.  The codename is now VanillaIceCream.

Bug: 264658905
Test: m checkbuild
Change-Id: Ibc24c10cf040407d79662c1819beaf97da791efb
Merged-In: Ibc24c10cf040407d79662c1819beaf97da791efb
2023-04-22 00:23:50 +00:00
Alex Buynytskyy
20466aa978 [RESTRICT AUTOMERGE] UpsideDownCake/34 is now REL
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I4b5e9939b60cde7482021fc1d0aede38a99493c1
Merged-In: I4b5e9939b60cde7482021fc1d0aede38a99493c1
2023-04-21 19:37:09 +00:00
Treehugger Robot
f85af51468 Merge changes from topic "presubmit-am-e7bd37b8d4a54cc5a85736dbe59d11b1" into tm-qpr-dev-plus-aosp am: cbcde78d22
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Change-Id: If47f10b8d733055b04e0c9a81f525011de706765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 20:59:31 +00:00
Xin Li
c350dd238e Merge TQ2A.230405.003
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
2023-04-11 00:00:10 -07:00
Steve Berbary
83110082f8 [automerge] Update Security String to 2023-06-05 2p: 908e3504d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Bug: 277078610
Change-Id: I5046a63eda6de8307fbc94d86746c2906d444688
2023-04-11 01:55:59 +00:00
Steve Berbary
908e3504d8 Update Security String to 2023-06-05
Bug: 277078610
Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
2023-04-11 01:54:58 +00:00
Alex Buynytskyy
e7dc4736dc UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I956555f9e767cca52a410536a9cd832e9f7a0f05
2023-04-09 15:13:20 +00:00
Roberto Gil
5a7c6f0045 [automerge] Bump SDK Extension version to 6 2p: b3300a79f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22427132

Bug: 276851559
Change-Id: If22270b175966050ff1a048ec4de2b72994f28e4
2023-04-04 15:23:13 +00:00
Roberto Gil
b3300a79f6 Bump SDK Extension version to 6
This bump includes Adservices, Extservices

Bug: 276851559
Test: The build passes
Ignore-AOSP-first: Finalization is not perform in AOSP
Change-Id: I3b087f0d98212a62728d78b10e4c520ca6745cca
2023-04-04 11:53:45 +00:00
Dan Albert
bd6fc3785f Acknowledge V in AOSP. am: 2549214184 am: a2308ffc88 am: 31c62f4c44
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: I15ea9fa745a8253ba9e18a105c57bf45fc7a23df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:43:06 +00:00
Dan Albert
31c62f4c44 Acknowledge V in AOSP. am: 2549214184 am: a2308ffc88
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: I0e0d48d699ef4d43ba78c576010436debc787162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:37:01 +00: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
Steve Berbary
fa8a0ea9ef Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: I0428ed3835e0c0f151569654133ae406ab5f3c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 04:38:34 +00:00
Steve Berbary
24272b1f7e Update Security String to 2023-05-01 am: 2130534b73
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: If0001148ac378f7433dc325320d20e4456c056c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 03:50:29 +00:00
Steve Berbary
72e9b8675e Update Security String to 2023-05-05 am: be772485c3 am: 072f723276
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028

Change-Id: If91e327a31200c158cea3639b985710810b87172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 01:58:16 +00:00
Steve Berbary
072f723276 Update Security String to 2023-05-05 am: be772485c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028

Change-Id: I6d3f9eb5d4c285be1a90852231bf03ef3f5bdcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 01:17:35 +00:00
Roberto Gil Del Sol
26aa1b5efb Revert "Bump SDK Extension version to 6" am: 44f6963cb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21982904

Change-Id: I02015578609fa3bc3f3a59670a84ded97acc98da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 17:53:31 +00:00
Roberto Gil Del Sol
44f6963cb0 Revert "Bump SDK Extension version to 6"
This reverts commit b3b72e8910.

Reason for revert: Due to lack of testing extServices needs to deboard M-05 train and sdk finalization needs to be reverted

Change-Id: I278a499b5c30f13617c134ce27a43a8ffa32e099
2023-03-13 08:33:02 +00:00
Steve Berbary
2130534b73 Update Security String to 2023-05-01
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-11 02:50:50 +00:00
Steve Berbary
be772485c3 Update Security String to 2023-05-05
Bug: 272844037
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-11 02:47:39 +00:00
Presubmit Automerger Backend
a98e773dcb [automerge] Bump SDK Extension version to 6 2p: b3b72e8910
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21613310

Bug: 271242945
Change-Id: If5fd36d49e3cbdd278f23f2832657c6635e26c1a
2023-03-01 15:16:29 +00:00
Roberto Gil
b3b72e8910 Bump SDK Extension version to 6
This bump includes Adservices

Bug: 271242945
Test: The build passes
Ignore-AOSP-first: Finalization is not perform in AOSP
Change-Id: I0a9b2f9329a176732f9567a5602e902958555304
2023-03-01 15:16:20 +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