Paul Duffin
525d7a8a14
Merge "Revert "Enable mainline prebuilts on tm-dev branch."" into tm-dev
2022-05-23 14:49:47 +00:00
TreeHugger Robot
96a5be9a1d
[automerger skipped] Merge "RESTRICT AUTOMERGE Update Build ID for APK-in-APEX fix for July" into sc-mainline-prod am: 4da50cef35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18527745
Change-Id: Iee941ed1d7a9da1b7742f81724092cb776826fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:10:13 +00:00
Oriol Prieto Gasco
fdb06149b9
[automerger skipped] RESTRICT AUTOMERGE Update Build ID for APK-in-APEX fix for July am: 8248deb030
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18527745
Change-Id: Ie2962292eff4dd9fa5beb116ca2622dda284794a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:10:10 +00:00
TreeHugger Robot
4da50cef35
Merge "RESTRICT AUTOMERGE Update Build ID for APK-in-APEX fix for July" into sc-mainline-prod
2022-05-21 01:50:52 +00:00
Oriol Prieto Gasco
8248deb030
RESTRICT AUTOMERGE Update Build ID for APK-in-APEX fix for July
...
Bug: 229625490
Change-Id: I622ab780c9dac19e0216b3b2e079ca577381d632
2022-05-21 01:21:27 +00:00
Paul Duffin
dddc036bd1
Revert "Enable mainline prebuilts on tm-dev branch."
...
This reverts commit de9f0b12f1
.
Reason for revert: breaks build_test and build_test2 on git_tm-dev.
Reverting the topic together does not work due to limitations with TH. However, this is the change that caused the error, the other changes were just fixing issues unrelated to this specific problem.
Bug: 233412962
Bug: 230478310
Bug: 223592962
Change-Id: I4d4de4f4c63c9c34fb083edbe76b09852af357e4
Test: presubmit
2022-05-21 00:17:09 +00:00
Dario Freni
de9f0b12f1
Enable mainline prebuilts on tm-dev branch.
...
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.
Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Change-Id: Ibc3ea584b95f8186c63e29f71b5164451dc433cd
2022-05-20 11:40:39 +00:00
Steve Berbary
76f9e63c51
[automerger skipped] Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
am: 166dd8b22a
am: 66dae5dd97
am: 8bd5e9bf6c
am: b9240bdb57
-s ours am: 7ede316c56
-s ours
...
am skip reason: Merged-In I745bd646af530a8c202994e48a0821a5cb7ec3dd with SHA-1 e359b90082
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: Id1457c930b02a9a557e98eba027280741df8e655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 01:36:38 +00:00
Steve Berbary
d03e496311
[automerger skipped] Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
am: 166dd8b22a
am: 66dae5dd97
am: 8bd5e9bf6c
am: 35897e956b
-s ours
...
am skip reason: Merged-In I745bd646af530a8c202994e48a0821a5cb7ec3dd with SHA-1 e359b90082
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: If9e59a4f788d60d287d694d3ddfe654174218683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 01:24:29 +00:00
Steve Berbary
7ede316c56
[automerger skipped] Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
am: 166dd8b22a
am: 66dae5dd97
am: 8bd5e9bf6c
am: b9240bdb57
-s ours
...
am skip reason: Merged-In I745bd646af530a8c202994e48a0821a5cb7ec3dd with SHA-1 e359b90082
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: Ic6bafbdfd0d33a0a86fcb3ef379017ba1fc226c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 01:20:20 +00:00
Steve Berbary
b9240bdb57
Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
am: 166dd8b22a
am: 66dae5dd97
am: 8bd5e9bf6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: I7dc86b1d32d943a70bb6eaf7948958fd4b5cb39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 01:01:41 +00:00
Steve Berbary
35897e956b
Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
am: 166dd8b22a
am: 66dae5dd97
am: 8bd5e9bf6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: I8b9eee6eb8cca24080910aaffb7af69adb162893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 01:00:35 +00:00
Steve Berbary
8bd5e9bf6c
Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
am: 166dd8b22a
am: 66dae5dd97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: I3ebc2acf0fb09949608167eb435881c77df185a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 00:34:35 +00:00
Steve Berbary
66dae5dd97
Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
am: 166dd8b22a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: Ia330d45e4f150e5ade9d5ed979546518c90276b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 00:05:47 +00:00
Steve Berbary
166dd8b22a
Update Security String to 2022-07-01 am: 1596620c59
am: c6b531b53f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: I5599da740bba907deb747a1aa96953b41e2d3966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 23:17:42 +00:00
Steve Berbary
c6b531b53f
Update Security String to 2022-07-01 am: 1596620c59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356644
Change-Id: I38e613a5f63140355713b452040bfa448023aa10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 22:53:56 +00:00
Remi NGUYEN VAN
7c87090ec4
Merge "Use non-next NetworkStack" into tm-dev
2022-05-17 04:23:45 +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
Omer Osman
2551027046
Merge "Update VNDK core to link to BT Audio HAL V2 library" into tm-dev
2022-05-13 16:54:28 +00:00
Ken Chen
4303e12b3e
Merge "Delete com.android.cronet from base_system" into tm-dev
2022-05-13 01:00:41 +00:00
Steve Berbary
1596620c59
Update Security String to 2022-07-01
...
Bug: 231380374
Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd
Merged-In: I745bd646af530a8c202994e48a0821a5cb7ec3dd
2022-05-12 18:51:11 +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
Ken Chen
85998a4a61
Delete com.android.cronet from base_system
...
No concrete plan to ship Cronet for now
Merged-In ID is from an unrelated change in this project that happens to be merged into branches downstream of tm-dev.
Bug: 230548501
Test: TH
Merged-In: Ifc6051cd9422b3f5c52322833d9a7f5e8263f857
Change-Id: I0ee3418a0def50a61251af665fbded869e0329e7
2022-05-12 13:53:26 +00:00
Remi NGUYEN VAN
8f559e099d
Use non-next NetworkStack
...
NetworkStack now builds against stable T APIs, so T can use
the stable binaries instead of the "next" versions.
Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.
This change should not go into development branches using unstable SDKs
(including aosp/master downstreams), as per the merged-in.
Bug: 216396304
Test: m
Merged-In: I12348bd913f724c4675177ce6cdf582948d9d03c
Change-Id: I8788c5af37c862e9a74cc140d1dc917fb15ec5a9
2022-05-12 13:20:51 +09:00
Kelvin Zhang
25d69c8bf5
Temporary hack for making T->S downgrade work
...
Downgrade OTA was broken because generic_ramdisk was removed from boot
partition in android T. Neither does O6 have init_boot. O6 also doesn't
include generic ramdisk in vendor boot, so no way for otatools to locate
contents of generic ramdisk. As a hack, omit boot partition timestamp if
we can't find ramdisk.
Test: generate T->S downgrade OTA for O6
Bug: 231656318
Merged-In: I9f5359462332aadadc324348873a3a4b2b126068
Change-Id: I9f5359462332aadadc324348873a3a4b2b126068
2022-05-10 05:06:47 +00:00
Omer Osman
d047f6968a
Update VNDK core to link to BT Audio HAL V2 library
...
Bug: 226441860
Test: A2DP sink device using bds-dev
Change-Id: Ib6dee1dbe7ef74762ca3a2b8d3382a76e6f5f005
2022-05-08 06:46:01 +00:00
Yurii Zubrytskyi
5e3cd45b5c
Merge "RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL" into tm-dev
2022-05-07 15:11:19 +00:00
Kelvin Zhang
f4406ca129
Merge identical key/val pairs in dynamic partition info
...
We might add new values to dynamic_partition_info.txt, so some kind of
generic fallback mechanism is needed. If keys are different, we need to
decided on a case-by-case basis which side takes precedence. For
example, Virtual AB requires vendor support, so vendor side takes
precedence. VABC on T+ devices are implemented entirely in system, so
system/framework side takes precedence.
Bug: 230876542
Test: th
Change-Id: I67747368547d3ef3e29ad64f8f818ef4c5896246
(cherry picked from commit 6a683ce02b
)
Merged-In: I67747368547d3ef3e29ad64f8f818ef4c5896246
2022-05-06 21:40: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
Inseob Kim
788648f63f
Add PLATFORM_VERSION_LAST_STABLE to soong config
...
Bug: 189164487
Test: build
Change-Id: Iec36d22af80225f6da848bae1e02d263ff957df8
Merged-In: Iec36d22af80225f6da848bae1e02d263ff957df8
(cherry picked from commit a59b4dcd33
)
2022-05-02 09:52:26 +09:00
Yurii Zubrytskyi
a84dc6cb63
platform/build/make - T is now 33 #2
...
update the api surface after some late fixes
Bug: 225745567
Test: Build
Change-Id: I5f14776ddb1d042c77ec4ea0fab0e25b4a89a4a1
2022-04-28 15:18:03 -07:00
Jiyong Park
0b2eb8f45e
Updated vndk list
...
The recent freeze of android.hardware.[light|power] is reflected.
Bug: 17983786
Test: m nothing
Change-Id: I72ad4891b6afc30ccfc7ac87a1e86fb77827bedb
2022-04-28 10:38:39 +09:00
Iavor-Valentin Iftime
42a7160300
Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae2b
am: 7ee275cb81
am: 9fd594c53c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068347
Change-Id: Id6c31fc941b14f5349b3b43f314c1a97872a4b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:06:22 +00:00
Iavor-Valentin Iftime
9fd594c53c
Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae2b
am: 7ee275cb81
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068347
Change-Id: I59ba0ef87233e7a9d74577d94fcce8ce6e9a2c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 16:43:39 +00:00
Iavor-Valentin Iftime
7ee275cb81
Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae2b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068347
Change-Id: I6f0c35272d7d29971d91610d3a094c6311dccf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 16:27:03 +00:00
Iavor-Valentin Iftime
71585eae2b
Merge "Rebuild and copy recovery and boot img when using vendor_otatools"
2022-04-21 16:07:12 +00:00
Lucas Wei
035fdee0ef
Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3
am: bd66e32393
am: b8b3c0d0ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760
Change-Id: Ibcf742f858c37141ab59cbd2d9c589ae15cf6ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:48:40 +00:00
Lucas Wei
b8b3c0d0ab
Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3
am: bd66e32393
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760
Change-Id: I99a78c5ffa7b15bbb77d786b88b408fab81eded3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:29:44 +00:00
Lucas Wei
bd66e32393
Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760
Change-Id: Id07cc7552755a32503950c7e6e736a14b3baa366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 03:36:00 +00:00
Lucas Wei
2d5ecef1b3
Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot"
2022-04-21 03:07:15 +00:00
Treehugger Robot
63ff2c20f7
Merge "Declare license metadata for copied files." am: d7856b74dc
am: e1da8fe40b
am: 75e70bef8b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492
Change-Id: I13a3ffed760f9a4fafa1062c38726070265940e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:58:57 +00:00
Treehugger Robot
75e70bef8b
Merge "Declare license metadata for copied files." am: d7856b74dc
am: e1da8fe40b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492
Change-Id: I8d1b2d6c0f8af8cc89de10bd989fbe6cf95a5623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:35:06 +00:00
Treehugger Robot
e1da8fe40b
Merge "Declare license metadata for copied files." am: d7856b74dc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492
Change-Id: I70ce9aef9791a18081e989134eadfcb9d20ea5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:19:14 +00:00
Treehugger Robot
d7856b74dc
Merge "Declare license metadata for copied files."
2022-04-20 23:58:24 +00:00
Ivan Lozano
7a9900a3ae
Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e
am: 2f619a0787
am: 3dba55b9cd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490
Change-Id: I46d86fd10c8265ce16c17110e67a94c276f5a9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:19:20 +00:00
Treehugger Robot
df0327b8ad
Merge "Add boot AVB key setting to GSI" am: f9fcd028df
am: d02479f849
am: 7ab456ee2a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887
Change-Id: Ic62f5c94f4159e5442204ccc11d9aa1865d2d132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:18:43 +00:00
Steven Moreland
db20a629af
Merge "Start script to finalize branch release." am: 7a396db029
am: 969dd0f48b
am: 767a7d9cc3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066080
Change-Id: I07605566e7e53d1de301eb8957ff5fe65504e251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:18:34 +00:00
Ivan Lozano
3dba55b9cd
Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e
am: 2f619a0787
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490
Change-Id: I222a9d507d31020ee33f3f519bf8b886c837243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:03:20 +00:00
Treehugger Robot
7ab456ee2a
Merge "Add boot AVB key setting to GSI" am: f9fcd028df
am: d02479f849
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887
Change-Id: I873031bb86a262812c097df724619ebd35cf794e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:02:54 +00:00
Steven Moreland
767a7d9cc3
Merge "Start script to finalize branch release." am: 7a396db029
am: 969dd0f48b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066080
Change-Id: Ic9f9058e8630598f3111a43de0ab994c07365e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:02:18 +00:00