Commit Graph

3550 Commits

Author SHA1 Message Date
Treehugger Robot
e8b9724200 Merge "Allow building super.img on targets without BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT set." 2022-07-16 03:55:40 +00:00
Cory Barker
5a8669d877 Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 602b19905c
Original change: https://android-review.googlesource.com/c/platform/build/+/2151557

Change-Id: I9fcc34c735bd90d8acf319a035ef8b1c583c6f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 16:45:56 +00:00
Cory Barker
602b19905c Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" 2022-07-14 16:26:41 +00:00
Cory Barker
91ee4f9e49 Adding support for building AFLpp
Test: Built AFL fuzzers locally and ran them

Change-Id: I1dc2b8e46877327f1b2a881798c74480442f2bcc
2022-07-12 21:32:53 +00:00
Cory Barker
4ab0d5531d Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" am: 990e6041ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2151854

Change-Id: I2957590fbb01793f9c7de679f9ab9b43863fc921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 20:40:44 +00:00
Cory Barker
990e6041ea Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" 2022-07-12 20:20:00 +00:00
Cory Barker
cadfdc16b9 Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."
Revert "Adding support for building AFLpp Test: Build AFL fuzzer..."

Revert submission 2124256-AFLpp support in Soong

Reason for revert: It is breaking the build
Reverted Changes:
Ie07ec3368:Adding support for building AFLpp Test: Build AFL ...
I5bd6d1e9b:Adding support for building AFLpp Test: Built AFL ...

Change-Id: Iad3fa47397cfe3310f80e109af93d66eb40d9ab4
2022-07-12 18:04:17 +00:00
Cory Barker
6c54a1a369 Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 66a7233b58
Original change: https://android-review.googlesource.com/c/platform/build/+/2124220

Change-Id: I29273d21519c046eb74a20eb33c48f6bf4b93b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 17:39:55 +00:00
Cory Barker
66a7233b58 Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" 2022-07-12 17:21:05 +00:00
Andrew Scull
040a786d18 Merge "Extract fsverity_manifest_generator logic" am: caf7014585
Original change: https://android-review.googlesource.com/c/platform/build/+/2144921

Change-Id: I01e0848590cdd3ab84e19bdb28fc331b1ea1a051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 06:56:36 +00:00
Andrew Scull
caf7014585 Merge "Extract fsverity_manifest_generator logic" 2022-07-08 06:34:57 +00:00
Andrew Scull
0a6d2e54dc Extract fsverity_manifest_generator logic
Let the fsverity_manifest_generator logic be reused and just keep the
bits to generate the BuildManifest.apk. Since this can all be acheived
with a series of shell commands, remove the python script and just do it
directly in the Makefile.

Bug: 237384936
Test: TH
Change-Id: I168dc1cea0be72b5098f99e4183e080a687fb03e
2022-07-07 19:56:31 +00:00
Peter Collingbourne
683c493cc7 Allow building super.img on targets without BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT set.
With this change, if BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is unset, a
target will be declared for super.img so it becomes possible to build it
(e.g. with `m superimage`), but it will not be part of the default `droid`
target. This is useful for building a `super.img` on targets that do
not normally need one without needing to go through a slow `m dist` step.

Change-Id: I599e93b3fc41fc2c0642761fcda757c40e2736d6
2022-07-06 15:57:26 -07:00
Cory Barker
b86b5bed3f Adding support for building AFLpp
Test: Built AFL fuzzers locally and ran them

Change-Id: I5bd6d1e9b19558ce8135b19491160dba14dea04e
2022-07-06 21:17:19 +00:00
Yi-yo Chiang
2a87991836 Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" am: 380fcee20e
Original change: https://android-review.googlesource.com/c/platform/build/+/2141540

Change-Id: I271ed2d7d4c12e9da99eb9ed29df426eaedc0351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 04:05:55 +00:00
Yi-Yo Chiang
8b0776d1ca Fix init_boot.img build rule with TARGET_NO_KERNEL:=true
If TARGET_NO_KERNEL is true (device has prebuilt boot.img), then the
init_boot.img build arguments wouldn't be propagated correctly.
This is because INTERNAL_INIT_BOOT_IMAGE_ARGS is misplaced within a
`ifneq ($(strip $(TARGET_NO_KERNEL)),true)` conditional block.

Fix this by moving INTERNAL_INIT_BOOT_IMAGE_ARGS initialization into the
`ifeq ($(BUILDING_INIT_BOOT_IMAGE),true)` block, which is closer to its
first use.

Bug: 237630862
Test: m initbootimage
Change-Id: I6c0ee2c4b5d0be77a93311eba714e0ed555ffd25
2022-06-30 17:44:33 +08:00
Treehugger Robot
d385eb71cd Merge "Inline some variables that are only used in 1 place" am: a2ed2629c6 am: 8ee99853c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2128120

Change-Id: I4bc925cf9dddd10e5824b8f8b16afca03338a9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:32:05 +00:00
Cole Faust
8fc7befdbb Inline some variables that are only used in 1 place
Test: Presubmits
Change-Id: Ic72fdb6c401f345ecfcaacb0179a9a3cd6a13e9d
2022-06-15 16:10:49 -07:00
Treehugger Robot
920768cabb Merge "Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img" am: 1053d69c1f am: 7c82ad9e56
Original change: https://android-review.googlesource.com/c/platform/build/+/2116299

Change-Id: I6011de0c0c11fa9031e80a811ed00e6778a68cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 17:03:36 +00:00
Bowgo Tsai
c85a201d5e Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img
The value of BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS and
BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS are usually the same, e.g.,
--padding_size 4096 --rollback_index 1656979200.

However, in a split build, the value of
BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS might be empty.
Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS to correctly
assign the value for vbmeta_vendor.img.

Bug: 232360330
Test: TreeHugger
Change-Id: Ia26816bd309084c3a4c0df6b9f2f3fc5a28bc31a
2022-06-07 11:36:35 +08:00
Treehugger Robot
f6acd8f004 Merge "Create license metadata for copied targets." am: 1f0c3583a6 am: 62f582272d
Original change: https://android-review.googlesource.com/c/platform/build/+/2109383

Change-Id: Ia76ed06e5021d530bcba851df619048edede15f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:39:57 +00:00
Bob Badour
ba3372439f Create license metadata for copied targets.
Bug: 213388645

Test: m cts dist reportmissinglicenses
Change-Id: I43043e5e7b80d9f3210d6498c215846aec761add
2022-06-02 15:43:08 -07:00
Yi Kong
b30e92b381 Merge "Rename modulesAddedWall to modulesWarningsAllowed" am: 05b2217940 am: 57e3ba803a
Original change: https://android-review.googlesource.com/c/platform/build/+/2100875

Change-Id: Ib5fb1502c8503c902492b971938b50970361a31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 00:49:00 +00:00
Yi Kong
05b2217940 Merge "Rename modulesAddedWall to modulesWarningsAllowed" 2022-05-20 00:26:18 +00:00
Yi Kong
ee99ddf900 Rename modulesAddedWall to modulesWarningsAllowed
MODULES_ADDED_WALL is deceiving and it actually meant which modules are
allowed to have warnings (do not automatically append -Werror flag).

Test: presubmit
Bug: 233183337
Change-Id: Ia2eb972d3d76ba245840f9872cbcc66d2894dab3
2022-05-19 20:16:00 +08:00
Dmitrii Merkurev
03e324006b Merge "Introduce EROFS compress hints to the Android build system" am: 494358dec8 am: a13fbaa01f
Original change: https://android-review.googlesource.com/c/platform/build/+/2098052

Change-Id: I3ed091156c4b39dad6eaf578144ac3d070025988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:41:19 +00:00
Treehugger Robot
507b4e863f Merge "Create $(zip_root)/PVMFW & archive prebuilt used" am: d528b3c553 am: 7520b7526f
Original change: https://android-review.googlesource.com/c/platform/build/+/2096401

Change-Id: I751deaa8d3c030f8b26de1346a079c1514445348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 11:01:22 +00:00
Dmitrii Merkurev
8ab6603a43 Introduce EROFS compress hints to the Android build system
Make it possible to provide a prebuilt hints file to specify different compression strategies on a file basis for all partitions using:

BOARD_EROFS_COMPRESS_HINTS := <path>/erofs-hints.txt

or separately for every partition using:

BOARD_SYSTEMIMAGE_EROFS_COMPRESS_HINTS := <path>/system-partition-erofs-hints.txt
BOARD_VENDORIMAGE_EROFS_COMPRESS_HINTS := <path>/vendor-partition-erofs-hints.txt

Hints format: Each line is defined by tokens separated by spaces in the following form:

<pcluster-in-bytes> <match-pattern>

pcluster-in-bytes can be specified as 0 which mean file will not be compressed

Bug: 231934752
Test: used dump.erofs -S system.img to verify the system image isn't compressed after specifying BOARD_SYSTEMIMAGE_EROFS_COMPRESS_HINTS := no-compress.txt, where no-compress.txt contains 0 .*
Test: used dump.erofs --nid=<inode-for-all-apk-files> vendor.img to verify apk files are not compressed (the rest of the partition content is compressed)
Test: used dump.erofs -S <all-images> to verify all images are not compressed after specifying BOARD_EROFS_COMPRESS_HINTS := <path>/no-compress.txt
Change-Id: I64054e26af5ea5781c45d2183b7796a9ad2b7927
2022-05-17 23:10:37 +00:00
Treehugger Robot
d528b3c553 Merge "Create $(zip_root)/PVMFW & archive prebuilt used" 2022-05-17 16:34:22 +00:00
Anton Hansson
d8dd1090a5 Merge "Remove unused dependencies from sdk goals" am: 59f95bcd1c am: 3a3e601827
Original change: https://android-review.googlesource.com/c/platform/build/+/2096393

Change-Id: I844e032594ff9896da935c56f455ab656d5bae7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:39:49 +00:00
Pierre-Clément Tosi
c7b837872d Create $(zip_root)/PVMFW & archive prebuilt used
It might be useful to have access to the prebuilt that the Android build
used to create the pvmfw partition so add a new directory (similarly to
other partitions) containing the prebuilt (which is also the only
content of the partition). This is particularly useful in ATC, when
detecting if the prebuilt was updated by the build.

Bug: 232253742
Test: m
Change-Id: I1116d91ffb073821568bcaeed30bbb43873dcafa
2022-05-12 16:37:46 +01:00
Anton Hansson
55a8f02ea8 Remove unused dependencies from sdk goals
The SDK no longer includes system images, so no longer needs to depend
on targets that are only relevant for the system images.

Remove all the explicit dependencies that end up depending on
"everything" but are not included in the sdk zip.

Two positive side-effects:
- fewer unused things get built (now ~32k targets, down from ~108k)
- apexes no longer get built, eliminating the risk of mismatch between
  module sdk prebuilts and source-built AOSP apexes.

There are some potential risks with this CL:
- because we no longer forcefully rebuild everything, if there are bugs
  in dependencies of exising files in the SDK, incremental builds may
  not rebuild them.
- some files that get built into the SDK may be being built as a
  side-effect of other files included in the SDK, so removing one file
  may cause another to not get built. The solution to that is to add
  the file not getting built to ALL_SDK_FILES.

Bug: 205008975
Test: m sdk sdk_repo dist && diff sdk.zip before/after (identical)
Change-Id: I97284864f66aa88556fbe16864f45b04be97634e
2022-05-12 12:28:49 +00:00
Treehugger Robot
852217b90f Merge "fixup! Embed host liblz4.so in target_files" am: 5161627644 am: 14e4ad63e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2083403

Change-Id: I4ceb8e8fdb6c2169027abd750216813142ea206c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:45:57 +00:00
Håkan Kvist
8cabc71bf6 fixup! Embed host liblz4.so in target_files
Fix typo introduced in 6877e81467

Bug: 206729162
Test: m dist

Change-Id: I799cbc2048f0a3ac715ecf094049776b507b1505
2022-05-02 09:52:50 +02:00
Anton Hansson
f78b3ba480 Merge "Remove notice file for sdk system image" am: 721a377982 am: 148ece6d76
Original change: https://android-review.googlesource.com/c/platform/build/+/2075119

Change-Id: I2aac4396465f199ff35faf76e4569c0d21c60e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:36:18 +00:00
Anton Hansson
c3536674a9 Remove notice file for sdk system image
The system image itself is being removed from the sdk zip,
so remove the NOTICE file for it at the same time.

Bug: 205008975
Test: m sdk sdk_repo dist
Change-Id: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
2022-04-25 16:29:15 +01:00
Treehugger Robot
7ec455ad93 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113 am: fa33ae6ff8 am: 1a73e98758
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: I1e8ff054b8a9946bacf605f7565bbbc7941badeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:03:43 +00:00
Bowgo Tsai
85578e0a9d Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
GKI targets, e.g., `gki_arm64` or `gki_x86_64` have only
boot-*.img files without a ramdisk. It has no other images,
e.g., init_boot.img, system.img, etc.

The current build system assumes that the ramdisk is either
in a boot.img or in a init_boot.img, which is not true for
those GKI targets. Adding a new flag to support building
boot-*.img without a ramdisk while not building an init_boot.img.

Bug: 220834917
Test: build and `unpack_bootimg`
Change-Id: I789343c3e3d9ff0c36c0e19680a9792bd31a1c9f
2022-04-19 17:57:51 +08:00
Treehugger Robot
f1efdd1877 Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7 am: 05c690dd2e am: 2d16d3be49
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556

Change-Id: Iffa5eaf98453601e7edf7f012c28bcb1438193f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 06:15:22 +00:00
Treehugger Robot
80d2c8f7a7 Merge "Add build flags for legacy EROFS support." 2022-04-16 05:10:04 +00:00
Treehugger Robot
6067d6f37c Merge "Non-module targets." am: 03ea8842af am: d13457d943 am: 4b209efdf0
Original change: https://android-review.googlesource.com/c/platform/build/+/2063381

Change-Id: Iae1b0b592be3bf8166ca6d944695624f2a6712f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:47:36 +00:00
Bob Badour
5acd436645 Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I897cf0e6f875ce2d370772405f31cc94b999ef19
2022-04-14 17:59:01 -07:00
Treehugger Robot
d816479292 Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69 am: 5324ea0ca6 am: 2de37f9424
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032

Change-Id: I2751ba90417c8960ab5539f2fe181c66b4c69b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:39 +00:00
Treehugger Robot
2f6aa08f69 Merge "Remove unused combine-notice-files macro." 2022-04-11 19:42:48 +00:00
Yuntao Xu
69caac0966 Merge "Make file list by partitions for all lunch targets" am: 722d0a602a am: 990145b2ad am: 6a9f5909ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2034494

Change-Id: I9fc699864750a3b7c0893ffbb9315572a2bfc24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:08:51 +00:00
Yuntao Xu
722d0a602a Merge "Make file list by partitions for all lunch targets" 2022-04-08 15:29:15 +00:00
Bob Badour
6259a09b7a Remove unused combine-notice-files macro.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m cts reportmissinglicenses
Test: m droid reportmissinglicenses
Change-Id: I4cddf9a381a1258bdc2b1b42be72c447df10d234
2022-04-07 22:04:03 -07:00
Yuntao Xu
c21dc3c8c1 Make file list by partitions for all lunch targets
1. Filtered out the Android.mk file if the Make modules on them are
   not in the PRODUCT_PACKAGES or the correspoding deps;
2. Merged the Android.mk file list by partitions for all lunch targets.

Bug: 225256154
Test: lunch aosp_coral-eng; m
out/target/product/coral/mk2bp_remaining.html
Test: python3 build/make/tools/mk2bp_partition.py

Change-Id: I40919e81ab3c6bd516379f0acd72932e8db50088
2022-04-07 11:01:19 -07:00
Colin Cross
e03e64a4c9 Merge "Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""" am: d8cf9a5a30 am: 9bb87d3f51 am: e64f092723
Original change: https://android-review.googlesource.com/c/platform/build/+/2056437

Change-Id: Ibfb3b0f9bc648ef0d68e93841daf65b2a788a4b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:47:57 +00:00
Colin Cross
d8cf9a5a30 Merge "Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""" 2022-04-06 18:20:43 +00:00