Commit Graph

30087 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
48346b8491 Make change and version bump to SP2A.220505.001
Change-Id: I6010b413bbba0004c29440019a2e54a7e158d36d
2022-03-15 18:18:04 +00:00
Steve Berbary
a25ecc3ac0 Update Security String to 2022-05-05
Bug: 223313197
Change-Id: I5a35451e14cba5f115ab66926d62c4fa4556a267
(cherry picked from commit 825ae00092)
Merged-In: I5a35451e14cba5f115ab66926d62c4fa4556a267
2022-03-15 18:15:59 +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
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
Treehugger Robot
e50553da9b Merge "Remove SOONG_CONFIG_art_module_source_build fallback" 2022-03-14 19:33:55 +00: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
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
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
2684184530 Merge "Sundry non-module targets" 2022-03-10 13:01:40 +00:00
Treehugger Robot
7506930ca5 Merge "Handle symlink license metadata." 2022-03-10 03:27:38 +00:00
Martin Stjernholm
6d91a8fd28 Clean up the special cases where we wouldn't be able to use the
prebuilt ART module.

They were added with the intention of flipping the last fallback to use
prebuilts by default, but that has been descoped. Instead let the ART
module variable default to the generic MODULE_BUILD_FROM_SOURCE.

Test: env MODULE_BUILD_FROM_SOURCE=true \
        build/soong/soong_ui.bash --dumpvars-mode \
        --vars="MODULE_BUILD_FROM_SOURCE ART_MODULE_BUILD_FROM_SOURCE"
  MODULE_BUILD_FROM_SOURCE='true'
  ART_MODULE_BUILD_FROM_SOURCE='true'
Test: env MODULE_BUILD_FROM_SOURCE=false \
        build/soong/soong_ui.bash --dumpvars-mode \
        --vars="MODULE_BUILD_FROM_SOURCE ART_MODULE_BUILD_FROM_SOURCE"
  MODULE_BUILD_FROM_SOURCE='false'
  ART_MODULE_BUILD_FROM_SOURCE='false'
Test: env MODULE_BUILD_FROM_SOURCE=false \
          ART_MODULE_BUILD_FROM_SOURCE=true \
        build/soong/soong_ui.bash --dumpvars-mode \
        --vars="MODULE_BUILD_FROM_SOURCE ART_MODULE_BUILD_FROM_SOURCE"
  MODULE_BUILD_FROM_SOURCE='false'
  ART_MODULE_BUILD_FROM_SOURCE='true'
Bug: 172480615
Bug: 184842499
Change-Id: I433e0236e595422f4d6fe2b4b2411491e3c600cf
2022-03-10 02:36:22 +00:00
Bob Badour
2f66fd1bcc Sundry non-module targets
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m systemlicense reportmissinglicense

Change-Id: Ie6350c3a61129d38c3901a9af9f5b4c05a7c2e2c
2022-03-09 18:12:26 -08:00
Bob Badour
289f6e10be Handle symlink license metadata.
Add target to force-build all license metadata.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m alllicensemetadata reportmissinglicenses
Change-Id: Iab3a41a232438e857d23674e0e1230d4d0336466
2022-03-09 13:38:37 -08:00
Pirama Arumuga Nainar
bd4f7c7ce7 Package llvm-cov in llvm-profdata.zip
It is needed for code coverage smoke test.  Retain the
`llvm-profdata.zip` name since it is used in Tradefed.

Test: `CLANG_COVERAGE=true m dist` and inspect llvm-profdata.zip
Change-Id: Icb48b0fa22deec8c3c49f0e5bb3ae33450883e0e
2022-03-08 23:09:53 -08:00
David Anderson
060505fb4a Merge "build_image: Remove mkerofsimage.sh." 2022-03-09 04:04:05 +00:00
Treehugger Robot
057667a90f Merge "Remove duplicate slashes from find_and_copy results" 2022-03-08 20:25:40 +00:00
Xin Li
7d4b3d25e7 Merge "Merge Android 12L" 2022-03-08 06:53:53 +00:00
Treehugger Robot
026abf7bad Merge "Accept CLANG_COVERAGE_CONTINUOUS_MODE build variable" 2022-03-08 06:37:02 +00:00
Alexander Smundak
842733cb67 Merge changes Iacd23cec,I6b9b3bd4
* changes:
  Add an option to use Starlark-based configuration by default.
  Clean up product definitions reading.
2022-03-08 01:07:14 +00:00
Sasha Smundak
b87b773042 Add an option to use Starlark-based configuration by default.
In order to use Starlark-based product and board configuration for
a product, add its name to the STARLARK_OPT_IN_PRODUCTS list in
the AndroidProducts.mk file where this product is defined.

Fixes: 220379303
Test: Temporarily added STARLARK_OPT_IN_PRODUCTS to build/make/target/product/AndroidProducts.mk
Change-Id: Iacd23cec00a7a1958701873bce0fc9d5f79b1f17
2022-03-07 11:26:59 -08:00
Sasha Smundak
d40c94633b Clean up product definitions reading.
Bug: 220379303
Test: treehugger
Change-Id: I6b9b3bd486a1680ace8278eb5160e09885543f4b
2022-03-07 11:25:58 -08:00
Cole Faust
c6de8d531c Remove duplicate slashes from find_and_copy results
The make version, find-copy-subdir-files, has very
similiar functionality: it adds `| sed "s://:/:g"`
to its results.

Fixes: 223221122
Test: Manually
Change-Id: Iaac96f760d46304aed27a7d31bb4e8bd930c2c55
2022-03-07 11:14:56 -08:00
Dario Freni
a05fb4002b Merge "Build modules from source by default." am: ec63efddf9
Original change: https://android-review.googlesource.com/c/platform/build/+/1998880

Change-Id: I367438214a7649cade2396b48ed3efb14b564075
2022-03-07 17:26:25 +00:00
Dario Freni
ec63efddf9 Merge "Build modules from source by default." 2022-03-07 17:00:39 +00:00
Dario Freni
fd8c869065 Build modules from source by default.
Most branches, most of the time, will build modules from source. By
changing the default we make it easier to switch a whole branch to use
module prebuilts by requiring only one CL to be committed on that branch
and nowhere else.

Before this change, dozens of Soong targets needed to be updated when
deciding to start using prebuilts for modules and sdk stubs. In
addition, the typical need is to enable prebuilts on a single branch at
the time, which resulted in a dozens of "D0 N0T MERGE ANYWHERE" CLs,
causing a lot of confusion.

Bug: 184842499
Test: (on a branch with ModuleMetadataGoogle enabled as prebuilt):
  m out/target/product/sunfish/product/app/ModuleMetadataGoogle/ModuleMetadataGoogle.apk
  (verified with `aapt2 dump badging` that apk is built from source)
  MODULE_BUILD_FROM_SOURCE=false m out/target/product/sunfish/product/app/ModuleMetadataGoogle/ModuleMetadataGoogle.apk
  (verified with `aapt2 dump badging` that apk is prebuilt)

Change-Id: I625c48640c4bb1edf360605a1daac293a4a0a07a
2022-03-07 17:00:09 +00:00
David Anderson
f54665f42a Add build flags for legacy EROFS support.
EROFS images by default will only work on newer kernels. Old versions of
5.4 and 4.19 need an extra flag to mkfs.erofs.

Add BUILD_EROFS_USE_LEGACY_COMPRESSION to force this flag.

Bug: 222373106
Test: build with BUILD_EROFS_USE_LEGACY_COMPRESSION enabled
Change-Id: I3818e14356beaa11073c6b9fea6a6ad999bba4aa
2022-03-04 14:47:17 -08:00
Cole Faust
dc426cf23b Merge "Add ART_MODULE_BUILD_FROM_SOURCE to control the equivalent soong config variable" am: 1421f7c7c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2000971

Change-Id: I65fb099bacdea8e2c8382838f1d86e8edae51774
2022-03-04 22:22:38 +00:00
Cole Faust
1421f7c7c3 Merge "Add ART_MODULE_BUILD_FROM_SOURCE to control the equivalent soong config variable" 2022-03-04 22:02:24 +00:00
Pirama Arumuga Nainar
0a04ec1f3b Accept CLANG_COVERAGE_CONTINUOUS_MODE build variable
Bug: http://b/194128476

Coverage instrumentation will support continuous mode when this flag is
set.

Test: CLANG_COVERAGE_CONTINUOUS_MODE m and verify continuous mode works.
Change-Id: I187574c600ba10145dfb2c6c23551d235c33103a
2022-03-04 12:45:33 -08:00
David Anderson
94ad5bb5ef build_image: Remove mkerofsimage.sh.
These wrapper scripts are difficult to maintain and there's not really
any value add. The argument strings don't match and every new build flag
has to be connected in an extra place.

Bug: 222715577
Test: make with EROFS enabled
Change-Id: Ie0e51cc30aa08b004d5d8345a2a2d885e193ffa9
2022-03-04 11:07:43 -08:00
Treehugger Robot
578d7b2492 Merge "Phony target to report all library names." am: f2a0110d36
Original change: https://android-review.googlesource.com/c/platform/build/+/2002324

Change-Id: I236cdbe7b5723e0b2c54075bca83fb471346d2cc
2022-03-04 02:50:26 +00:00
Treehugger Robot
f2a0110d36 Merge "Phony target to report all library names." 2022-03-04 02:23:38 +00:00
Bob Badour
77570059cd Phony target to report all library names.
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m nothing reportallnoticelibrarynames

Change-Id: I0f791e2d92b8135d6af3a6c93f0db348fc69f5a1
2022-03-02 22:32:37 -08:00
Cole Faust
3f8f28026e Merge "Add Starlark implementation of add-product-dex-preopt-module-config" am: 339d56308d
Original change: https://android-review.googlesource.com/c/platform/build/+/2002313

Change-Id: I951c84fd3ac06ad25ff8a3c7349ee61b767a400c
2022-03-02 19:07:51 +00:00
Cole Faust
339d56308d Merge "Add Starlark implementation of add-product-dex-preopt-module-config" 2022-03-02 18:40:36 +00:00
Treehugger Robot
857fa04e03 Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" am: ff17a1bd66
Original change: https://android-review.googlesource.com/c/platform/build/+/2004384

Change-Id: I37e5fcc920a6fa9e4b64d4a63aaa881bfca82ce6
2022-03-02 05:33:43 +00:00
Treehugger Robot
ff17a1bd66 Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" 2022-03-02 05:08:27 +00:00
Mitch Phillips
d51048acdd Revert "[cc_fuzz] Revert 'disable LTO' patches."
Revert "[cc_fuzz] Revert 'disable LTO' patches."

Revert submission 1976512-revert-nolto-fuzzing

Reason for revert: b/222160662
Reverted Changes:
Iacee4fa29:[cc_fuzz] Revert 'disable LTO' patches.
Ic509b00a1:[cc_fuzz] Revert 'disable LTO' patches.
If85931f09:[cc_fuzz] Revert 'disable LTO' patches.

Change-Id: I5f34731f0b7b27293636217f43d1cf5f17ab487b
2022-03-02 01:25:22 +00:00
Colin Cross
552c2d1c81 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I06dd0a5eef6a5dd16b1fd4b2d845d0de2ef088c9
2022-03-02 00:13:01 +00:00
Treehugger Robot
7bf9d4e1fa Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I94fbac5906c7864a750792333060068650e51404
2022-03-02 00:11:53 +00:00
Colin Cross
1fa84f1135 Merge "Add PLATFORM_DISPLAY_VERSION" 2022-03-02 00:01:05 +00:00
Treehugger Robot
df80322fcd Merge "[cc_fuzz] Revert 'disable LTO' patches." 2022-03-01 23:43:04 +00:00
Liz Kammer
0ac682fc9a Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I789ab17d3f3b73e66502c90d9eb5cc32313514bd
2022-03-01 15:47:55 +00:00
Liz Kammer
16e2fc2da1 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" 2022-03-01 15:19:34 +00:00
Yi-yo Chiang
e93bc67cf8 Merge changes from topic "gki-avb-vts" am: 9d164b6300
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: I2792c3946e3b0173b3592612009eafd62e1090cc
2022-03-01 05:12:46 +00:00