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
Bob Badour
540a3f8ec1
Declare license metadata for copied files.
...
Bug: 151177513
Test: m droid dist reportmissinglicenses
Change-Id: Iada4a0ba3583f78e9419a5f487388b5e5eba195a
2022-04-20 13:01:35 -07:00
Ivan Lozano
2f619a0787
Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490
Change-Id: Ica503d11bee5a8083e9138b90f912023f3510a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:33:45 +00:00
Treehugger Robot
d02479f849
Merge "Add boot AVB key setting to GSI" am: f9fcd028df
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887
Change-Id: I1483e2865bf8e82713103c7b976e5930fb4a23ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:59 +00:00
Steven Moreland
969dd0f48b
Merge "Start script to finalize branch release." am: 7a396db029
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066080
Change-Id: I50ae4254cc64892a144bd126ec6d9f2c03a0a1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:49 +00:00
Treehugger Robot
2763773a1a
Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5
am: 7137e03c4b
am: abd53cb613
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428
Change-Id: I677bde0d9c73f19a2631d2938c8826d949f1731b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:36 +00:00
Ivan Lozano
6689f3889e
Merge "rust: Add proc_macro NOTICE files"
2022-04-20 19:21:25 +00:00
Treehugger Robot
abd53cb613
Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5
am: 7137e03c4b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428
Change-Id: Iadc5b89a256454e009f886ffe34fcae335296f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:56:36 +00:00
Treehugger Robot
f9fcd028df
Merge "Add boot AVB key setting to GSI"
2022-04-20 18:55:53 +00:00
Steven Moreland
7a396db029
Merge "Start script to finalize branch release."
2022-04-20 18:45:26 +00:00
Treehugger Robot
7137e03c4b
Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428
Change-Id: I916fe02c73158a4563c8e3ad6cc8f092a2015fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:32:23 +00:00
Treehugger Robot
8a6fa9c7c5
Merge "Allow init_rc files to be installed in ramdisk"
2022-04-20 18:07:17 +00:00
Lucas Wei
03230250a3
vendor_kernel_boot: Update releasetools for vendor_kernel_boot
...
add_img_to_target_files.py will re-make image and build a new
signed vbmeta.img with new images in target-file.
We need to add vendor_kernel_boot into AVB signing list and make it
support that image.
Test: make dist -j110 and check vbmeta.img
Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Id07433f3dc33f95e2edd49de890f1e098cb9ef31
2022-04-21 00:27:27 +08:00
Trevor Radcliffe
d3325d15ce
Merge "Add comment for previous CL" am: 1e63a893dc
am: 7cecfb7ffa
am: eaaae159bc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045
Change-Id: Ia79235faba34f3f16fa84415dc8ac5d42cbd662b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:42:57 +00:00
Trevor Radcliffe
eaaae159bc
Merge "Add comment for previous CL" am: 1e63a893dc
am: 7cecfb7ffa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045
Change-Id: Iaecb70a18e68e9082d40d7debf129b7554cf391f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:18:09 +00:00
Trevor Radcliffe
7cecfb7ffa
Merge "Add comment for previous CL" am: 1e63a893dc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045
Change-Id: I54647f88cee8a17d2b2aee5f58ec4de6a284e6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:40:24 +00:00
Trevor Radcliffe
1e63a893dc
Merge "Add comment for previous CL"
2022-04-20 14:16:22 +00:00
SzuWei Lin
97064c53ff
Add boot AVB key setting to GSI
...
Signing tool assumes GSI targets has boot.img and get error without
these settings.
Bug: 229814765
Change-Id: I1e8e7f6375e396e1c2feb858b97e7d27dc5a2dec
2022-04-20 07:20:45 +00:00
Treehugger Robot
9f99087283
Merge "Correct abspath implementation" am: 9ec1a7aa72
am: fcae811f2c
am: 3033cc5982
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367
Change-Id: Ie2fac8474be0853fca2820f9e38f90cb91412216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:24:35 +00:00
Treehugger Robot
f585c50d8e
Merge "Sort inherited products correctly" am: 0339142a27
am: 188e38ecd4
am: 8444f7fddf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079
Change-Id: If2785c4848682aca5dbc2dea7c37793434119cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:23:03 +00:00
Colin Cross
bc28181e3d
Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de
am: b8999c3d88
am: 1e492a67d2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912
Change-Id: I47ac1a65c04c32666535e20c44f989921e013577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:21:19 +00:00