Commit Graph

76365 Commits

Author SHA1 Message Date
Treehugger Robot
423e117fa2 Merge "Package llvm-cov in llvm-profdata.zip (take 2)" 2022-03-15 21:37:55 +00:00
Steve Berbary
a4528f9d6e Update Security String to 2022-05-01 am: 8f3602319f am: ea3776556c am: 16ddab6505 am: 960e360a9d am: d692a1ce8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17184858

Change-Id: Iada88057b782252c798f7b9d4780a54445b6da5f
2022-03-15 21:19:50 +00:00
Steve Berbary
d692a1ce8a Update Security String to 2022-05-01 am: 8f3602319f am: ea3776556c am: 16ddab6505 am: 960e360a9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17184858

Change-Id: Icbeeaad1b19f303f8bb966451040bd5fb1bd43dc
2022-03-15 20:51:53 +00:00
Cole Faust
45c489ba5e Merge "Make inherit-product loop over all files passed to it" am: 2089403223 am: 57a82be14d
Original change: https://android-review.googlesource.com/c/platform/build/+/2016698

Change-Id: I6037c18568b064f69ba3086893caa5c7a6c74c32
2022-03-15 20:40:09 +00:00
Steve Berbary
960e360a9d Update Security String to 2022-05-01 am: 8f3602319f am: ea3776556c am: 16ddab6505
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17184858

Change-Id: Ie1db3b31d39559416091321eb776e43fec00be7b
2022-03-15 20:25:30 +00:00
Colin Cross
7ee2eaaf79 Use single module for clang runtime libraries
The clang prebuilts now provide a single module with per-architecture
variants instead of a module per architecture.

Bug: 220019988
Test: m checkbuild
Change-Id: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
Merged-In: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
2022-03-15 13:14:53 -07:00
Cole Faust
57a82be14d Merge "Make inherit-product loop over all files passed to it" am: 2089403223
Original change: https://android-review.googlesource.com/c/platform/build/+/2016698

Change-Id: I9bf55cb353b805f82fa7d500d8a7ff51d5e5c7d0
2022-03-15 19:59:40 +00:00
Steve Berbary
16ddab6505 Update Security String to 2022-05-01 am: 8f3602319f am: ea3776556c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17184858

Change-Id: I89a26ff9a83456063c7091a5623654261cedf754
2022-03-15 19:58:54 +00:00
Steve Berbary
ea3776556c Update Security String to 2022-05-01 am: 8f3602319f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17184858

Change-Id: I5c9739be45e95ddd671b9f8b2737bb05660936c3
2022-03-15 19:33:09 +00:00
Cole Faust
2089403223 Merge "Make inherit-product loop over all files passed to it" 2022-03-15 19:31:35 +00:00
Kelvin Zhang
83eb9f7fb1 Add ota_extractor to otatools.zip
This is a newly added binary for extracting device images out of full
OTA package. Add to otatools.zip so that go/bts-image-sharing project
can use it.

Test: th
Bug: 221875271
Change-Id: If2bf85e89a2a12cc00f709dfd21a453c2d805d4f
2022-03-15 11:31:36 -07:00
Rob Seymour
c4e2754380 Update extract items call in merge_dexopt.
Test: merge builds with VSDK image
Change-Id: I7788164ecbd69408d2293f49b98ab88db67e9cd9
2022-03-15 17:43:51 +00:00
Yi-Yo Chiang
411fac84d6 Rename init_boot properties to ro.init_boot.*
Right now they're named ro.bootimage.* which is really confusing.
Change it so that if generic ramdisk is in boot.img, then name the
properties as ro.bootimage.*, otherwise if generic ramdisk is in
init_boot.img, then name the prop as ro.init_boot.*.

Bug: 211823573
Test: m dist
Change-Id: Icff3c7be04b9a3c6490fbf49ba4f05565b029890
2022-03-15 18:08:10 +08:00
James Chen
9c185aaed6 Merge "Revert "Package llvm-cov in llvm-profdata.zip"" am: 1b8a1490a9 am: fe9c063243
Original change: https://android-review.googlesource.com/c/platform/build/+/2026003

Change-Id: I21ba6bbd96790df1df9a44626b9bb6d207c2a018
2022-03-15 06:02:47 +00:00
James Chen
fe9c063243 Merge "Revert "Package llvm-cov in llvm-profdata.zip"" am: 1b8a1490a9
Original change: https://android-review.googlesource.com/c/platform/build/+/2026003

Change-Id: Idfde9842ae228863c926d7c5a38982e9f0f473d5
2022-03-15 05:36:44 +00:00
Pirama Arumuga Nainar
4e3d6334da Package llvm-cov in llvm-profdata.zip (take 2)
Bug: http://b/214396112

It is needed for code coverage smoke test.  Retain the
`llvm-profdata.zip` name since it is used in Tradefed.

This fixes aosp/2017370 which incorrectly packaged llvm-profdata twice.

Test: `CLANG_COVERAGE=true m dist` and inspect llvm-profdata.zip
Change-Id: Ic1cbebff3f6fbea04a6c58c6d57557d0ffde14ae
2022-03-14 22:25:11 -07:00
James Chen
1b8a1490a9 Merge "Revert "Package llvm-cov in llvm-profdata.zip"" 2022-03-15 05:09:55 +00:00
James Chen
ccf5111f4a Revert "Package llvm-cov in llvm-profdata.zip"
This reverts commit bd4f7c7ce7.

Reason for revert: b/224640947

Change-Id: I0eee5e9b75ac39513e43448c3bb63f18545cbc49
2022-03-15 02:13:40 +00:00
Steve Berbary
e4abae8a45 Merge changes from topic "presubmit-am-af5ea525ca0b47719063253a628cb9f4" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Update Security String to 2022-05-05 2p: 825ae00092
  Update Security String to 2022-05-05
2022-03-14 21:39:04 +00:00
Daniel Norman
59069f92c4 Merge changes from topic "mtf-cleanup-infer" am: d5d938742d am: ef8eb14d88
Original change: https://android-review.googlesource.com/c/platform/build/+/2006311

Change-Id: I31a52d1d3c8a77c1aa62e0346e165478d50e5c72
2022-03-14 21:35:53 +00:00
Daniel Norman
ef8eb14d88 Merge changes from topic "mtf-cleanup-infer" am: d5d938742d
Original change: https://android-review.googlesource.com/c/platform/build/+/2006311

Change-Id: I71eaac467be1a5bbcda4a680a5f58536c90d0dfe
2022-03-14 21:10:09 +00:00
Treehugger Robot
7151415278 Merge "Split VABC into two .mk files" am: 344245b278 am: a7393ae928
Original change: https://android-review.googlesource.com/c/platform/build/+/2015629

Change-Id: I3853cfa64f062ee48b1f4c7169c2a5672fa7645a
2022-03-14 20:42:23 +00:00
Treehugger Robot
7e4ece7569 Merge "Remove SOONG_CONFIG_art_module_source_build fallback" am: e50553da9b am: e4da9dc874
Original change: https://android-review.googlesource.com/c/platform/build/+/2016677

Change-Id: Id49c799fa85bbe163b9689cd629ed450c7e4c8da
2022-03-14 20:41:59 +00:00
Daniel Norman
d5d938742d Merge changes from topic "mtf-cleanup-infer"
* changes:
  Infer merge configs if not provided.
  Split the huge merge_target_files script into multiple files.
2022-03-14 20:37:04 +00:00
Treehugger Robot
a7393ae928 Merge "Split VABC into two .mk files" am: 344245b278
Original change: https://android-review.googlesource.com/c/platform/build/+/2015629

Change-Id: I2bec879662f058941b9f8500787eefecacf9e8d3
2022-03-14 20:15:56 +00:00
Treehugger Robot
e4da9dc874 Merge "Remove SOONG_CONFIG_art_module_source_build fallback" am: e50553da9b
Original change: https://android-review.googlesource.com/c/platform/build/+/2016677

Change-Id: Ia164e190f633154810cae725315d8543d10a053e
2022-03-14 20:15:26 +00:00
Treehugger Robot
344245b278 Merge "Split VABC into two .mk files" 2022-03-14 19:54:15 +00:00
Treehugger Robot
e50553da9b Merge "Remove SOONG_CONFIG_art_module_source_build fallback" 2022-03-14 19:33:55 +00:00
Steve Berbary
a492541a8d [automerge] Update Security String to 2022-05-05 2p: 825ae00092
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17126794

Bug: 223313197
Change-Id: I9044bd87ee243d4bf06b56bad9c3a6cc4dc8ca87
2022-03-14 18:13:09 +00:00
Steve Berbary
825ae00092 Update Security String to 2022-05-05
Bug: 223313197
Change-Id: I5a35451e14cba5f115ab66926d62c4fa4556a267
2022-03-14 18:12:54 +00:00
Steve Berbary
8f3602319f Update Security String to 2022-05-01
Bug: 223313197
Change-Id: I5a35451e14cba5f115ab66926d62c4fa4556a267
Merged-In: I5a35451e14cba5f115ab66926d62c4fa4556a267
2022-03-14 18:11:01 +00:00
Eric Jeong
5c55d72c6b Remove iorapd from base product packages
- iorapd is being removed.
- So, it cannot be installed.

Bug: 211461392
Test: build okay
Change-Id: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
Merged-In: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
(cherry picked from commit 4c0ac42c06)
2022-03-14 10:29:07 -07:00
Pirama Arumuga Nainar
0f44776802 Merge "Package llvm-cov in llvm-profdata.zip" am: 72815bdf00 am: 25e6cc9560
Original change: https://android-review.googlesource.com/c/platform/build/+/2017370

Change-Id: Ic36a663ef125eb0ce02b13cef0fe6b548f7d8e72
2022-03-14 17:03:43 +00:00
Pirama Arumuga Nainar
25e6cc9560 Merge "Package llvm-cov in llvm-profdata.zip" am: 72815bdf00
Original change: https://android-review.googlesource.com/c/platform/build/+/2017370

Change-Id: Ic059e0278e6e7b98c8c274b7c896f6142b4c8a63
2022-03-14 16:40:22 +00:00
Kelvin Zhang
ecdfb79033 Split VABC into two .mk files
1. android_t_baseline.mk enables baseline features, such as io_uring,
   userspace merge, etc. But sets compression method to none. T
   launching devices should include this. It also moves snapuserd from
   vendor_ramdisk to init_boot
2. To add compression, set PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD to
   gz/brotli

Test: th
Bug: 219841787

Change-Id: I6ae4d951b0a64f142acd4c152ce96375d47ecf74
2022-03-14 09:31:47 -07:00
Pirama Arumuga Nainar
72815bdf00 Merge "Package llvm-cov in llvm-profdata.zip" 2022-03-14 16:11:21 +00:00
Bowgo Tsai
662a2c610a Clear OS version and patch level fields for GKI boot images
GKI boot images will not set system version & SPL value in the
boot image header. They can be set by the device manufacturer
in the AVB properties instead.

Bug: 211741246
Test: build and `unpack_bootimg`
Change-Id: Ib357184636cb0c0c9b2a380ab3e3da7621d21790
2022-03-14 18:03:00 +08:00
Cole Faust
725aab2c83 Make inherit-product loop over all files passed to it
Currently inherit-product and the rest of the product
configuration infrastructure does not handle wildcards.
However, they still get passed through unchanged, until
they reach the raw Make include statement, which expands
them. This essentially makes a meta-product that is the
result of combining all the makefiles that were matched.

In Starlark, the behavior is to actually treat each file
as it's own product. This causes a discrepency when using
`m product-graph`, where make shows one node for all those
files and Stalark has a node for each.

This is probably unintentional behavior, so change Make
to also import each file as separate products. On the
product I was investigating, the only difference this
made in the ninja file was in the product graph.

Bug: 221312856
Test: Presubmits
Change-Id: I9ca7aff0b0790aeb6e42861ce2745feed8a1a7c4
2022-03-10 16:59:00 -08:00
Treehugger Robot
567da60c58 Merge "Moves merge scripts into a new merge folder." am: 51005914bd am: 0d0abf6cbc
Original change: https://android-review.googlesource.com/c/platform/build/+/2006512

Change-Id: I6b7aea4893fa6313da4774c37b8af546e23105ad
2022-03-11 00:27:20 +00:00
Treehugger Robot
0d0abf6cbc Merge "Moves merge scripts into a new merge folder." am: 51005914bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2006512

Change-Id: I20a06111e7634a39c12f3358ea1c919ae72faf31
2022-03-11 00:03:46 +00:00
Daniel Norman
5f47677f00 Infer merge configs if not provided.
Bug: 221858722
Test: Create a merged package using inferred configs.
Test: atest --host releasetools_test
Change-Id: I93d67ca0f00be3f0e0424ed0a1e44c39ca2f3094
2022-03-10 23:56:12 +00:00
Daniel Norman
2465fc8594 Split the huge merge_target_files script into multiple files.
Bug: 221858722
Test: m otatools; Use to create merged builds
Test: atest --host releasetools_test
Change-Id: I5f932f160d3f6405b41a7721b1c75cc96749e77b
2022-03-10 23:56:00 +00:00
Treehugger Robot
51005914bd Merge "Moves merge scripts into a new merge folder." 2022-03-10 23:39:28 +00:00
Cole Faust
8f15becda4 Remove SOONG_CONFIG_art_module_source_build fallback
Usages of SOONG_CONFIG_art_module_source_build have been
replaced with ART_MODULE_BUILD_FROM_SOURCE now.

Bug: 220940864
Test: Presubmits
Change-Id: Ibe2115e385efe3ec02cd66ff3c5aca73ce986508
2022-03-10 12:45:46 -08:00
Bob Badour
e9bdbc59f1 More non-module targets.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m alllicensemetadata reportmissinglicenses
Change-Id: Ifc4e3504edf3f48068ae88fe36c9f7660018dd5a
2022-03-10 11:31:07 -08:00
Martin Stjernholm
4e23be853e Merge "Clean up the special cases where we wouldn't be able to use the prebuilt ART module." am: 22e398c08d am: d3bc6a0734
Original change: https://android-review.googlesource.com/c/platform/build/+/2018058

Change-Id: I7947a917eb4fce2a543ce35613619c2999c1e0ae
2022-03-10 17:35:30 +00:00
Martin Stjernholm
d3bc6a0734 Merge "Clean up the special cases where we wouldn't be able to use the prebuilt ART module." am: 22e398c08d
Original change: https://android-review.googlesource.com/c/platform/build/+/2018058

Change-Id: Iafdea1421bef38f20cedca506b9ee28ecb1d83fb
2022-03-10 17:10:46 +00:00
Martin Stjernholm
22e398c08d Merge "Clean up the special cases where we wouldn't be able to use the prebuilt ART module." 2022-03-10 16:42:18 +00:00
Treehugger Robot
7fe2fe6327 Merge "Sundry non-module targets" am: 2684184530 am: c61946a84b
Original change: https://android-review.googlesource.com/c/platform/build/+/2019377

Change-Id: I31ef3992049dc78743fac99c2ba7c4ce9a5a1df4
2022-03-10 13:51:03 +00:00
Treehugger Robot
c61946a84b Merge "Sundry non-module targets" am: 2684184530
Original change: https://android-review.googlesource.com/c/platform/build/+/2019377

Change-Id: Ia27a5165daded496adb85cbf7114d5622ba34e99
2022-03-10 13:27:17 +00:00