Commit Graph

76365 Commits

Author SHA1 Message Date
Colin Cross
a143b5ecc4 Merge "Track licenses of dexpreopted bootjars" am: 503b779266
Original change: https://android-review.googlesource.com/c/platform/build/+/2027386

Change-Id: If6c7b1afbd9de6d9503a174f3a0d2c97180a7268
2022-03-17 02:49:06 +00:00
Beth Thibodeau
51cbf7ea12 Merge "Revert "Enable CFI for Bluetooth in new home"" am: cdd28862c3 am: 64cfe91ace
Original change: https://android-review.googlesource.com/c/platform/build/+/2028833

Change-Id: I8189fb73edcc4d35b5966a08530edc511e4b20f8
2022-03-17 01:51:34 +00:00
Colin Cross
503b779266 Merge "Track licenses of dexpreopted bootjars" 2022-03-17 01:48:47 +00:00
Beth Thibodeau
64cfe91ace Merge "Revert "Enable CFI for Bluetooth in new home"" am: cdd28862c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2028833

Change-Id: Idd331bab88da50d351a5696521efc1d20e163afc
2022-03-17 01:17:47 +00:00
Beth Thibodeau
cdd28862c3 Merge "Revert "Enable CFI for Bluetooth in new home"" 2022-03-17 00:49:07 +00:00
Beth Thibodeau
2b0dd3bcbd Revert "Enable CFI for Bluetooth in new home"
This reverts commit 6c7cce123c.

Reason for revert: DroidMonitor: Potential culprit for b/225059300 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Change-Id: I0f790404ba95ec2ba343c31faa58f4eb7c198758
2022-03-17 00:21:02 +00:00
Colin Cross
c6f0d967cb Track licenses of dexpreopted bootjars
Propagate the license metadata for dexpreopted bootjars.  Requires
rewriting the generated module to look more like as Soong module so
that it can use LOCAL_SOONG_LICENSE_METADATA.

Bug: 224612665
Test: m alllicensemetadata reportmissinglicenses
Change-Id: Ibd3269594462a0c38a3427d0c7838620a9b84551
2022-03-16 14:21:08 -07:00
Treehugger Robot
5b70644ea6 Merge "Enable CFI for Bluetooth in new home" am: 21b35496ee am: 1eb525078b
Original change: https://android-review.googlesource.com/c/platform/build/+/2028706

Change-Id: I4b3c5804b01ff563ce6fc0543ab5ab1478bfe546
2022-03-16 20:52:41 +00:00
Treehugger Robot
09e836dd7b Merge "Notice files and non-module targets." am: dd780ca8d0 am: a9e626d783
Original change: https://android-review.googlesource.com/c/platform/build/+/2001031

Change-Id: I57aa24412dc873cce535c6a0e26b0165a081d9e2
2022-03-16 20:52:32 +00:00
Treehugger Robot
1eb525078b Merge "Enable CFI for Bluetooth in new home" am: 21b35496ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2028706

Change-Id: I796d9913e96c3b5c4e855f53824d2981dd411d1c
2022-03-16 20:41:54 +00:00
Treehugger Robot
21b35496ee Merge "Enable CFI for Bluetooth in new home" 2022-03-16 20:34:04 +00:00
Treehugger Robot
a9e626d783 Merge "Notice files and non-module targets." am: dd780ca8d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2001031

Change-Id: I0c582424e6e4c11a38f0dba4f77dde0deb3f1ec1
2022-03-16 20:33:28 +00:00
Treehugger Robot
dd780ca8d0 Merge "Notice files and non-module targets." 2022-03-16 20:05:07 +00:00
Colin Cross
55e2707fc8 Merge "Use Make path for system_linker_config" am: 6dc51855a4 am: c457a49f3a
Original change: https://android-review.googlesource.com/c/platform/build/+/2027110

Change-Id: I10aba2dec652b542196ab11e91331356d4bf48bf
2022-03-16 18:23:02 +00:00
Colin Cross
c457a49f3a Merge "Use Make path for system_linker_config" am: 6dc51855a4
Original change: https://android-review.googlesource.com/c/platform/build/+/2027110

Change-Id: If67ebc9739e923bee707af807acfcf70de865534
2022-03-16 17:53:44 +00:00
Patrick Rohr
6cb033a1dc Merge "Remove ethernet-service jar dependency." am: 33b6aaff5e am: 9fe5b86d85
Original change: https://android-review.googlesource.com/c/platform/build/+/2024726

Change-Id: I17ac94bf0cea90dfae8823dce0256a142d235ec6
2022-03-16 17:44:04 +00:00
Colin Cross
6dc51855a4 Merge "Use Make path for system_linker_config" 2022-03-16 17:24:00 +00:00
Patrick Rohr
9fe5b86d85 Merge "Remove ethernet-service jar dependency." am: 33b6aaff5e
Original change: https://android-review.googlesource.com/c/platform/build/+/2024726

Change-Id: I6866808e29edc28e3265d3beb64e76dae017e472
2022-03-16 17:13:42 +00:00
Myles Watson
6c7cce123c Enable CFI for Bluetooth in new home
Bug: 221893030
Test: cert/run
Tag: #gd-refactor
Change-Id: I34d8749d200de04b68f7ad9bd5b49b06dddc7841
2022-03-16 10:03:23 -07:00
Patrick Rohr
33b6aaff5e Merge "Remove ethernet-service jar dependency." 2022-03-16 16:03:30 +00:00
Lucas Wei
f57333f7fc Make build support vendor_kernel_boot image
Add vendor_kernel_boot image for vendors whose bootloader support
extra first stage booting kernel modules ramdisks. This benefit
kernel repo to build kernel-artifacts only image without Andorid
artifacts dependency.

Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: If07218b86a7751b3d452a172610af960f5f9ec74
2022-03-16 23:13:19 +08:00
Bram Bonne
029dffaf72 Cherry pick sdk_sandbox dev keys.
Test: make, boot

Bug: 224796470
Bug: 203670791
Bug: 220320098

Merged-In: Ib0cdf7786c7f74cf294c54187649114e8ec6d315
Merged-In: I3f757c7e3e81c2ac31cd623eae68f7778bf3bafa
Change-Id: I70d6a745b8b2fc9ba68791caae2e83f8eb74c645
2022-03-16 15:39:41 +01:00
Bob Badour
70c07dda93 Notice files and non-module targets.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m nothing reportmissinglicenses

Change-Id: Icdb11d3c72b180cd02231e8dc98ae500d6566a98
Merged-in: Icdb11d3c72b180cd02231e8dc98ae500d6566a98
2022-03-16 05:57:41 -07:00
Treehugger Robot
197e0be8ef Merge "Remove GKI from gsi_$arch" am: 9fee6befad am: 9b0c214673
Original change: https://android-review.googlesource.com/c/platform/build/+/1936198

Change-Id: Icf347df31a1503af06e64e8233def4db5bf8c25e
2022-03-16 08:07:52 +00:00
Treehugger Robot
9b0c214673 Merge "Remove GKI from gsi_$arch" am: 9fee6befad
Original change: https://android-review.googlesource.com/c/platform/build/+/1936198

Change-Id: I8a29a4bca63751f5a37fb45e50580ab7f3dbba73
2022-03-16 07:29:27 +00:00
Treehugger Robot
9fee6befad Merge "Remove GKI from gsi_$arch" 2022-03-16 07:07:46 +00:00
Treehugger Robot
6debab1cf8 Merge "Clear OS version and patch level fields for GKI boot images" am: 8131404331 am: 40783868d8
Original change: https://android-review.googlesource.com/c/platform/build/+/2022898

Change-Id: I8768138d82af53b3903e97fe1f6cb7e10e973f97
2022-03-16 06:31:37 +00:00
Treehugger Robot
40783868d8 Merge "Clear OS version and patch level fields for GKI boot images" am: 8131404331
Original change: https://android-review.googlesource.com/c/platform/build/+/2022898

Change-Id: I4c051b6573a270b5867bda9ba20179fe210839fb
2022-03-16 06:06:35 +00:00
Treehugger Robot
8131404331 Merge "Clear OS version and patch level fields for GKI boot images" 2022-03-16 05:37:43 +00:00
Treehugger Robot
8dd153d008 Merge "More non-module targets." am: 9a21773efe am: da66e2c46d
Original change: https://android-review.googlesource.com/c/platform/build/+/2021235

Change-Id: I964a4d759aa4364a981ad3519571a1f8c85b1b59
2022-03-16 03:41:26 +00:00
Albert Wang
7c15560cf8 Merge "Revert "Turn off adb on user builds."" am: 7be6751e00 am: 41eb7e3542
Original change: https://android-review.googlesource.com/c/platform/build/+/1913436

Change-Id: I053944427aaf6e531f4662e6a389134581613364
2022-03-16 03:41:09 +00:00
Treehugger Robot
da66e2c46d Merge "More non-module targets." am: 9a21773efe
Original change: https://android-review.googlesource.com/c/platform/build/+/2021235

Change-Id: Idbabc172ebf9b5f841af7ff4485828add92f7cb3
2022-03-16 03:27:06 +00:00
Treehugger Robot
9a21773efe Merge "More non-module targets." 2022-03-16 03:15:32 +00:00
Albert Wang
41eb7e3542 Merge "Revert "Turn off adb on user builds."" am: 7be6751e00
Original change: https://android-review.googlesource.com/c/platform/build/+/1913436

Change-Id: Ice7ef8d7512613dc5937e6fece5873ea9f8cd463
2022-03-16 03:13:15 +00:00
Albert Wang
7be6751e00 Merge "Revert "Turn off adb on user builds."" 2022-03-16 02:48:39 +00:00
Xiao Ma
cb1e69c3bf Remove ethernet-service jar dependency.
ethernet service source code is going to be moved into Connectivity
mainline module, and start the ethernet service from the module. The
old ethernet-service lib will be deprecated, remove it from soong
build rule.

Bug: 210586283
Test: m
Change-Id: Iae154ca3462e76b7e0af7172d424f36dece63531
Merged-In: I19d517cac28c18c70b8dad979ecbfe3fb6d26902
2022-03-16 00:54:09 +00:00
Treehugger Robot
a060f57ac6 Merge "Add ota_extractor to otatools.zip" am: b945cd2890 am: ed3eeff610
Original change: https://android-review.googlesource.com/c/platform/build/+/2027304

Change-Id: I9f3e13f5b990416cc9cfff04a35d7ad7f94c7232
2022-03-15 23:46:07 +00:00
Treehugger Robot
93cdd1b4ad [automerger skipped] Merge "Use single module for clang runtime libraries" am: b60e8fb75b am: 7e8a93cf91 -s ours
am skip reason: Merged-In Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867 with SHA-1 13bbb49c87 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2027384

Change-Id: Ia62ef11dba601f50a070f12e74610751af3e69dc
2022-03-15 23:45:35 +00:00
Treehugger Robot
ed3eeff610 Merge "Add ota_extractor to otatools.zip" am: b945cd2890
Original change: https://android-review.googlesource.com/c/platform/build/+/2027304

Change-Id: I880adeeb1629b8477c90eaa629305fb2e12962c5
2022-03-15 23:19:31 +00:00
Treehugger Robot
7e8a93cf91 Merge "Use single module for clang runtime libraries" am: b60e8fb75b
Original change: https://android-review.googlesource.com/c/platform/build/+/2027384

Change-Id: Icc64b5c9ee049362cd075a52fdc2b136836bc2f7
2022-03-15 23:19:21 +00:00
Treehugger Robot
b945cd2890 Merge "Add ota_extractor to otatools.zip" 2022-03-15 23:17:20 +00:00
Treehugger Robot
b60e8fb75b Merge "Use single module for clang runtime libraries" 2022-03-15 22:52:55 +00:00
Rob Seymour
1c59c596d2 Merge "Update extract items call in merge_dexopt." am: 6ae6a3aef6 am: 5e9faa8c3d
Original change: https://android-review.googlesource.com/c/platform/build/+/2027303

Change-Id: Ied37ec58ea7cc646da2f4857e5a2d42ead4e66e5
2022-03-15 22:42:12 +00:00
Treehugger Robot
b815c86cd6 Merge "Package llvm-cov in llvm-profdata.zip (take 2)" am: 423e117fa2 am: 5dc3d4f43b
Original change: https://android-review.googlesource.com/c/platform/build/+/2024705

Change-Id: If873fe7ba219712967b3ee6162c3b75ed59f2d1e
2022-03-15 22:42:04 +00:00
Rob Seymour
5e9faa8c3d Merge "Update extract items call in merge_dexopt." am: 6ae6a3aef6
Original change: https://android-review.googlesource.com/c/platform/build/+/2027303

Change-Id: Ic49c6d0fa636caba6e8b54f5d215ac01dfac8062
2022-03-15 22:13:14 +00:00
Treehugger Robot
5dc3d4f43b Merge "Package llvm-cov in llvm-profdata.zip (take 2)" am: 423e117fa2
Original change: https://android-review.googlesource.com/c/platform/build/+/2024705

Change-Id: I6fa5ef9d4bf7adf1c1c487f9f104968637ec8d38
2022-03-15 22:13:04 +00:00
Steve Berbary
6a555d8cc7 [automerger skipped] Update Security String to 2022-05-01 am: 8f3602319f am: ea3776556c am: 16ddab6505 am: 960e360a9d am: d692a1ce8a am: a4528f9d6e -s ours am: 9c404f387d -s ours
am skip reason: Merged-In I5a35451e14cba5f115ab66926d62c4fa4556a267 with SHA-1 825ae00092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17184858

Change-Id: I50f3e64ea044a1b48c0533d0b64c0164e50b16d8
2022-03-15 22:11:09 +00:00
Colin Cross
d4a054fb40 Use Make path for system_linker_config
Use the Make path for system_linker_config instead of a variable
exported by Soong so that the license information is correctly
associated.

Test: m alllicensemetadata reportmissinglicenses
Change-Id: I3d375220d829b2ef88b500ef6c1ea6bf8f46e6ac
2022-03-15 15:07:07 -07:00
Rob Seymour
6ae6a3aef6 Merge "Update extract items call in merge_dexopt." 2022-03-15 22:03:46 +00:00
Steve Berbary
9c404f387d [automerger skipped] Update Security String to 2022-05-01 am: 8f3602319f am: ea3776556c am: 16ddab6505 am: 960e360a9d am: d692a1ce8a am: a4528f9d6e -s ours
am skip reason: Merged-In I5a35451e14cba5f115ab66926d62c4fa4556a267 with SHA-1 825ae00092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17184858

Change-Id: Iac9983bacde3c5aabc93dceece63fd520dfc5a9f
2022-03-15 21:45:59 +00:00