Commit Graph

79137 Commits

Author SHA1 Message Date
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
4a71082ecf Merge "Use non-next NetworkStack" into tm-dev am: 7c87090ec4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18331684

Change-Id: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 04:59:57 +00:00
Remi NGUYEN VAN
7c87090ec4 Merge "Use non-next NetworkStack" into tm-dev 2022-05-17 04:23:45 +00:00
Steve Berbary
a269be12ae 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: I2363baf29612b1fc29c3ae3729ca27b4d2e64634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:17:27 +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
10138b05e6 Merge "Update VNDK core to link to BT Audio HAL V2 library" into tm-dev am: 2551027046
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18112478

Change-Id: Ib47979667b56c4ab971d915d4c2f875da8c317e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:16:42 +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
4055a3911c Merge "Delete com.android.cronet from base_system" into tm-dev am: 4303e12b3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18180369

Change-Id: I1bafa0d35dc97a3d05d0b1dee6e0f83de65564cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 02:46:42 +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
Kelvin Zhang
e5e5739892 Temporary hack for making T->S downgrade work am: 25d69c8bf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18246946

Change-Id: I688e7f47c14f3f3173950551ec402fc69aeb93fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:14:01 +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
91f0ec2884 Merge "RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL" into tm-dev am: 5e3cd45b5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17763342

Change-Id: I219111fb0b8840eadc1715a01c10e92b9b394e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 15:41:22 +00:00
Yurii Zubrytskyi
2de3e7058a RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL am: f1687f9848
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17763342

Change-Id: I2b1417d830c43ba3661308163bf43819dc03ae3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 15:41:11 +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
5d4999ff20 Merge identical key/val pairs in dynamic partition info am: f4406ca129
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18205260

Change-Id: I497169300e3b7a4b003e05d0f3dcbfa23e047d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:30:28 +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
Inseob Kim
06e3a82743 Add PLATFORM_VERSION_LAST_STABLE to soong config am: 788648f63f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17944026

Change-Id: I4c9a6c9c463e19856fd430f93800cab1572a04d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:24:13 +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
Yurii Zubrytskyi
25b4d09ba9 platform/build/make - T is now 33 #2 am: a84dc6cb63
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18083390

Change-Id: I489e13d9c04a2623c030b9da1ed7a6898834b66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 19:48:16 +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
464b192606 Updated vndk list am: 0b2eb8f45e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17983683

Change-Id: I4705a6bc8b935233028da1301c4177cd59219f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 16:57:46 +00: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
032f5cccf9 Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae2b am: 7ee275cb81 am: 9fd594c53c am: 42a7160300
Original change: https://android-review.googlesource.com/c/platform/build/+/2068347

Change-Id: Ie8b128ee46d0542d28bfa5638ad558a9590ea6e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:28:23 +00: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
5ce373834c Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3 am: bd66e32393 am: b8b3c0d0ab am: 035fdee0ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760

Change-Id: I9179cdaf46adda16f406c43f9b80f9e3a893ae2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 05:03:38 +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
deb70eec9e Merge "Declare license metadata for copied files." am: d7856b74dc am: e1da8fe40b am: 75e70bef8b am: 63ff2c20f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I40ab83ed9e6f4cc62fdd3933469f9fe13da45226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:23:51 +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
7e87adcabb Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e am: 2f619a0787 am: 3dba55b9cd am: 7a9900a3ae
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: I169b75741ea8b2c0a79c9532c0f711cfb78115e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:36:56 +00:00
Treehugger Robot
6493f47e18 Merge "Add boot AVB key setting to GSI" am: f9fcd028df am: d02479f849 am: 7ab456ee2a am: df0327b8ad
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887

Change-Id: Iacc9c0d2456e6567d3ae271745bc4c8ccc1dcc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:36:43 +00:00
Steven Moreland
a62fd8e444 Merge "Start script to finalize branch release." am: 7a396db029 am: 969dd0f48b am: 767a7d9cc3 am: db20a629af
Original change: https://android-review.googlesource.com/c/platform/build/+/2066080

Change-Id: Iac6017f16aa79e40c4ed0a3691bff2273a9d11e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:36:21 +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