Commit graph

3526 commits

Author SHA1 Message Date
Bob Badour
a60beeefc3 Add kernel license text.
Bug: 244521066

Test: m droid dist

Change-Id: Ie7052d97cbe11df8f6a184663903e66ae5cd5752
2022-09-08 10:31:21 -07:00
Cole Faust
b000208877 Rename mkf2fsuserimg.sh and mksquashfsimage.sh
See other cl in this topic for more information.

Bug: 198619163
Test: Presubmits
Change-Id: Ib39e8513a303a12e8bb6464a114ec39aa087d58a
2022-09-05 18:34:56 -07:00
hungweichen
f1f5dd3011 Remove VB related code
Cleaning up the related references of VB in Makefile

Bug: 241044073
Change-Id: I9e0ec9d433f2e76951c4390f716cf77674174930
2022-08-17 08:52:17 +00:00
Hung-Wei Chen
a7dfb456a1 Merge changes Ifbcde7da,Icee659ff,I267da2d5
* changes:
  Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
  Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
  Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
2022-08-17 03:09:20 +00:00
Yifan Hong
f19cd6f89f Merge "Support GKI with non-A/B recovery" am: e6f92d1411
Original change: https://android-review.googlesource.com/c/platform/build/+/2183837

Change-Id: Ieb4ea09d84477f3f14f02a04eac44f3cef7c2ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 21:30:31 +00:00
celeste wang
e3d43208d9 Support GKI with non-A/B recovery
Using BOARD_PREBUILT_BOOTIMAGE instead of TARGET_NO_KERNEL to determine prebuilt boot.img.
So kernel is not excluded from recovery.img.

Bug: 187157581
Change-Id: I4163c8093c52b01d97db3cdb4f9daf840a27c23a
Test: make target-files-package
2022-08-12 08:39:22 +00:00
hungweichen
bf11e34897 Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
PRODUCT_SUPPORTS_VERITY and PRODUCT_SUPPORTS_VERITY_FEC are going to be
deprecated since we removed VB 1.0 support. This change removes the
related references.

Bug: 241044073
Test: atest under build/make
Change-Id: Icee659ff0606cda1ab44e92372d86a394ddf1466
2022-08-11 08:12:58 +00:00
hungweichen
b2dd683421 Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
These varaibles are going to be deprecated since we removed VB 1.0
support. This change removes the related references. boot.img can be
verified by a AVB 2.0 hash descriptor now.

Bug: 241044073
Test: atest under build/make
Change-Id: I267da2d591525ffc0cabf92791cf66a36ef8ff62
2022-08-11 08:12:58 +00:00
Treehugger Robot
2cf5c43709 Merge "Use aapt2" am: 07c507b519
Original change: https://android-review.googlesource.com/c/platform/build/+/2178694

Change-Id: Ifbbbb693b727b44aa42e7f492a7ce55e5333f71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 02:17:45 +00:00
Treehugger Robot
07c507b519 Merge "Use aapt2" 2022-08-10 01:21:11 +00:00
Cory Barker
bbf2a82ee1 Merge "Revert^2 "Updated the way we build AFL++ fuzz binaries"" am: 6a0fbc761e
Original change: https://android-review.googlesource.com/c/platform/build/+/2177768

Change-Id: I9766f0c8b3329304fd4c5273ec0a61f78977240b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:14:41 +00:00
Saeid Farivar Asanjan
0b4f8d542f Use aapt2
Replace usage of `$(AAPT)` with `$(AAPT2)`.

Bug: 236602069
Test: m nothing
Change-Id: I079bfe1eebfedda855ff585a20704f4f01c853d6
2022-08-09 16:14:38 +00:00
Cory Barker
eda150c3eb Revert^2 "Updated the way we build AFL++ fuzz binaries"
f3486b1020

Change-Id: Ib81aa706f5f9984b44ffaee7ccafba1728b55e6d
2022-08-08 19:12:02 +00:00
Cory Barker
325d0f806c Merge "Revert "Updated the way we build AFL++ fuzz binaries"" am: 85125778f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2177927

Change-Id: Ic04e4d777791a31253c8ddd257c9e59fb45b4aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 16:56:06 +00:00
Cory Barker
85125778f5 Merge "Revert "Updated the way we build AFL++ fuzz binaries"" 2022-08-08 16:37:28 +00:00
Cory Barker
f3486b1020 Revert "Updated the way we build AFL++ fuzz binaries"
Revert "Updated the way we build AFL++ fuzz binaries"

Revert "Updated the way we build AFL++ fuzz binaries"

Revert "Updated the way we build AFL++ fuzz binaries"

Revert submission 2164482-Build AFL from Command line option

Reason for revert: Unit test fails on MAC builds
Reverted Changes:
Ia7a822462:Updated the way we build AFL++ fuzz binaries
I994bde63b:Updated the way we build AFL++ fuzz binaries
Ie863853b4:Updated the way we build AFL++ fuzz binaries
I577d6ae7b:Updated the way we build AFL++ fuzz binaries
Ic4fd34f8d:Updated the way we build AFL++ fuzz binaries

Change-Id: I33a39001d6387fc67bb1d7b5551762d2f145a68d
2022-08-08 15:55:12 +00:00
Cory Barker
5cce2c9570 Merge "Updated the way we build AFL++ fuzz binaries" am: af569e28c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2163803

Change-Id: I1a8ee4506dbc3632d069cfac8b8fe07df1b6977a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:47:01 +00:00
Cory Barker
af569e28c5 Merge "Updated the way we build AFL++ fuzz binaries" 2022-08-08 14:24:16 +00:00
Treehugger Robot
81421fe772 Merge "Revert "Revert "Fix missing notices.""" am: e2325f0ef6
Original change: https://android-review.googlesource.com/c/platform/build/+/2172708

Change-Id: I85f7975e53db2fa982d0baae50fb26bc6ac3d543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 22:55:01 +00:00
Bob Badour
56e0de5784 Revert "Revert "Fix missing notices.""
This reverts commit 18f8049da1.

Reason for revert: Roll forward with fix

Fix missing notices.

Move ALL_DEFAULT_INSTALLED_MODULES assignments back into Makefile

Fix typos DLMK -> DLKM

Bug: 240582127

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86 TARGET_BUILD_VARIANT=eng droid dist checkbuild

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86_64 TARGET_BUILD_VARIANT=userdebug droid dist checkbuild

Change-Id: If780669602c459c337585e9d2c4915b28844e2bb
Merged-in: If780669602c459c337585e9d2c4915b28844e2bb
2022-08-02 13:11:20 -07:00
Bob Badour
8ddadca927 Merge "Revert "Fix missing notices."" am: 7ec578b20a
Original change: https://android-review.googlesource.com/c/platform/build/+/2172705

Change-Id: Ib5e76e016f7cc4263dc3efd807e115f22003ea70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:47:48 +00:00
Henri Chataing
18f8049da1 Revert "Fix missing notices."
This reverts commit 8ef21add49.

Reason for revert: Potential build breakage aosp_x86_64-userdebug, aosp_x86-eng

Bug: 241113403

Change-Id: Ia10a6d43528feb00f874fe80b8aa9ab1aa4ebff2
2022-08-02 17:03:43 +00:00
Treehugger Robot
b192a54ab7 Merge "Fix missing notices." am: d7e72a7e0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2171783

Change-Id: Ib2af9d3e74b33e8dfbeee859b6b655fac5a447a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 16:06:15 +00:00
Bob Badour
8ef21add49 Fix missing notices.
Move ALL_DEFAULT_INSTALLED_MODULES assignments back into Makefile

Fix typos DLMK -> DLKM

Bug: 240582127

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Change-Id: I3d1886b017b233528898a42010442f11bbea11df
Merged-in: I3d1886b017b233528898a42010442f11bbea11df
2022-08-01 21:51:52 -07:00
Cory Barker
8a49a60143 Updated the way we build AFL++ fuzz binaries
Test: Built AFL fuzzers individually and built all using haiku command
and built libfuzzers individually and also by using haiku command. Ran
selected fuzzers manually to ensure fuzzing still worked.

Description: Previously we needed to add cc_afl_fuzz to build an afl fuzz binary,
however, to turn current libFuzzers into AFL fuzzers this would required
an update to each Android.bp file which is a lot of work, and would also
require an approval from each Android.bp file owner, which is even more
work.

To get around this (and also to match how AFL fuzzers are built in G3)
we will build AFL++ fuzz binaries by command line option FUZZ_FRAMEWORK.
When FUZZ_FRAMEWORK=AFL is set, all cc_fuzz modules will be built

Change-Id: I994bde63b759046c9e3d75d3acfdc1352412005b
2022-08-02 02:23:23 +00:00
Treehugger Robot
4482d2ff60 Merge "Allow building super.img on targets without BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT set." am: e8b9724200
Original change: https://android-review.googlesource.com/c/platform/build/+/2147421

Change-Id: I4c24336e0079846d710ca8a0752408af9084f750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-16 04:14:07 +00:00
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
Colin Cross
ac7febc9c7 Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""
This reverts commit 59ecb9e016.

Reason for revert: symbols_map is fixed to ignore non-elf files

Bug: 218888599
Change-Id: I88654b2dba3dfb9ab2809b0555544277279f345d
2022-04-06 01:11:20 +00:00
Colin Cross
92ead00c5c Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" am: cba35df61b am: e662f2e4db am: 1a652183f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2055033

Change-Id: I519ae7270d3b279230ce890e64de475fafa24820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:44:54 +00:00
Colin Cross
cba35df61b Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" 2022-04-05 17:53:24 +00:00
Colin Cross
59ecb9e016 Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"
This reverts commit 3570b3ed86.

Reason for revert: b/228195288

Bug: 218888599
Change-Id: I17b38ca1b6f8940d682f2782515bfd5f8db1ce58
2022-04-05 17:47:27 +00:00
Colin Cross
d651900385 Merge "Produce mappings of hashes to elf symbols and r8 dictionaries" am: 229fb33e39 am: 47e2aed61d am: 25681b47af
Original change: https://android-review.googlesource.com/c/platform/build/+/2035523

Change-Id: I6a9fd470c2bece57a6be2eec7be4156a59ff63bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 15:28:29 +00:00
Colin Cross
229fb33e39 Merge "Produce mappings of hashes to elf symbols and r8 dictionaries" 2022-04-05 14:16:16 +00:00
Colin Cross
3570b3ed86 Produce mappings of hashes to elf symbols and r8 dictionaries
Run the symbols_map tool on each unstripped binary and proguard
dictionary while copying it to produce a textproto that maps the
hash to the symbol/dictionary file location.  Combine the textprotos
into a mapping file when producing the zipped build artifacts.

Bug: 218888599
Test: m dist
Change-Id: I78997e2f3b631ed74213903cc8e72415b2d7eee0
2022-04-04 16:04:52 -07:00
Lucas Wei
4da8bbe987 Merge "Remove ALL_GENERATED_SOURCES" am: 20ba096e0a am: 766d8ec746 am: 85f3330d6c
Original change: https://android-review.googlesource.com/c/platform/build/+/2043036

Change-Id: I344c51da9578f73b091dc5e52c918f3ecfa6daf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 04:05:38 +00:00
Lucas Wei
20ba096e0a Merge "Remove ALL_GENERATED_SOURCES" 2022-04-01 03:00:10 +00:00
Treehugger Robot
a35c859df7 Merge "Support per-partition settings for os_version AVB props" am: 4a723d0ecf am: f2ed2638d2 am: fd3cabf6cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2049103

Change-Id: I0dd1df61f6810c0f5821c44f12c1452a2bae3e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 03:24:30 +00:00
Bowgo Tsai
b0f436386f Support per-partition settings for os_version AVB props
The value of the AVB properties are parsed by the device
bootloader, which might expect a different format of the value.
Allowing them to have per-device settings.

The default value of those per-partition os_version is
$(PLATFORM_VERSION_LAST_STABLE), which is usually an integer,
e.g., 12.

Bug: 211364958
Test: build then `avbtool info_image`
Change-Id: I2005df615c0ff35622030baa2477e29d9d20e94f
2022-03-30 11:52:39 +08:00
Lucas Wei
b235b690a0 Remove ALL_GENERATED_SOURCES
ALL_GENERATED_SOURCES contains the generated sources of modules
defined in Make.  They always have a path inside the intermediates
directories.  The only readers of ALL_GENERATED_SOURCES are filtering
for files in the output directories, and will never match anything.

Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I38c57cc6dad7d762adc001351322c0614e69ed98
2022-03-29 18:01:58 +08:00
Treehugger Robot
be88f3a95c Merge "Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES" am: d3a9957616 am: a2fefe18bd am: 486c2e88ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2043302

Change-Id: I522290e838020487bdf5865998e0d73529b656bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 04:35:55 +00:00
Colin Cross
41e93ea093 Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES
Don't depend on fake_packages, they are already expanded into their
required modules.

Bug: 225187583
Bug: 226573153
Test: check dependency path to out/target/product/coral/system/apex/com.android.vndk.current.apex
Change-Id: Id7a646fe0368051a4a4719f846a158de07be9d20
2022-03-25 17:31:49 -07:00
Treehugger Robot
0e9fbfd393 Merge "Support OUT_DIR for license graph." am: bc8d61f17b am: 443a7b25e3 am: f74478b33b
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930

Change-Id: I18d97926c690708b1c889d8e9cabe1ee97e15382
2022-03-24 05:07:20 +00:00
Treehugger Robot
bc8d61f17b Merge "Support OUT_DIR for license graph." 2022-03-24 00:43:58 +00:00
Bob Badour
c778e4cba4 Support OUT_DIR for license graph.
Bug: 226066987

Test: OUT_DIR=/tmp/outdir m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: OUT_DIR=/tmp/outdir m /tmp/outdir/target/product/bonito/obj/NOTICE.xml.gz
Test: m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: m out/target/product/bonito/obj/NOTICE.xml.gz

Change-Id: I6282c647a389c5935d5ce7c79193f86d32c76365
2022-03-23 14:12:12 -07:00
Treehugger Robot
f01576a4ab Merge "Add fsck.erofs to INTERNAL_OTATOOLS_MODULES" am: 3c51ee3122 am: 2874c1d5cf am: 10f38b6840
Original change: https://android-review.googlesource.com/c/platform/build/+/2033823

Change-Id: I5fc27e58d063aac17cf3a36682128b2a978c9e73
2022-03-23 13:08:01 +00:00
Treehugger Robot
3c51ee3122 Merge "Add fsck.erofs to INTERNAL_OTATOOLS_MODULES" 2022-03-23 12:14:08 +00:00
Woody Lin
e416419c0a Add fsck.erofs to INTERNAL_OTATOOLS_MODULES
The latest build_image.py requires fsck.erofs to execute. Adds
fsck.erofs to INTERNAL_OTATOOLS_MODULES so it can be packed into
otatools.zip.

Bug: 225756733
Signed-off-by: Woody Lin <woodylin@google.com>
Change-Id: Ib88dbb6cce5e9424d1e80173da34b503d32d0fd3
2022-03-23 10:33:35 +00:00
Colin Cross
2cd6b0fbf6 Merge changes I084158ff,I2f2ba905,Ic9af8761 am: ce3c48db58 am: e4c2fc9847 am: da2b3b3a5d
Original change: https://android-review.googlesource.com/c/platform/build/+/2035163

Change-Id: I3023baf758c90d516f0787da2c13d6a9069aeeaa
2022-03-23 00:06:08 +00:00
Colin Cross
ce3c48db58 Merge changes I084158ff,I2f2ba905,Ic9af8761
* changes:
  Depend on PRODUCT_COPY_FILES that are not in images
  Remove ALL_ORIGINAL_DYNAMIC_BINARIES
  Remove ALL_GENERATED_SOURCES
2022-03-22 22:24:39 +00:00
Treehugger Robot
c08b6b76e3 Merge "Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES" am: dd7dbbfe7b am: 38b2618e6a am: 3f5a084147
Original change: https://android-review.googlesource.com/c/platform/build/+/2032634

Change-Id: Ice10e4760a3e740472116a4e2d01bfc18b2e754d
2022-03-22 18:46:08 +00:00
Treehugger Robot
dd7dbbfe7b Merge "Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES" 2022-03-22 17:39:38 +00:00
Colin Cross
79a76ec581 Depend on PRODUCT_COPY_FILES that are not in images
If0e4b958b3dfaa02771a5da70f970379635f904e made `droidcore` stop
depending on `files` so that installed files from unbuilt images
would not be built.  That also disabled the dependency on installed
files that were not in any image, but the vendor notice file had
overly broad dependencies that caused them to still be built.
Icdb11d3c72b180cd02231e8dc98ae500d6566a98 made the vendor notice
file dependencies less broad, exposing the missing `droidcore`
dependencies.

Track the list of installed device files that are not included in any
image, built or unbuilt, and add them as a dependency for `droidcore`.

Bug: 225187583
Test: m checkbuild
Test: check dependency path to encryptionkey.img
Change-Id: I084158ffb52b353e9a3eca9ad06a68c80d3bd371
2022-03-22 09:25:58 -07:00
Colin Cross
a1de5df4bd Remove ALL_GENERATED_SOURCES
ALL_GENERATED_SOURCES contains the generated sources of modules
defined in Make.  They always have a path inside the intermediates
directories.  The only readers of ALL_GENERATED_SOURCES are filtering
for files in the output directories, and will never match anything.

Test: m checkbuild
Change-Id: Ic9af8761d445fa90088f838c385bd2aea3bc3048
2022-03-22 09:25:58 -07:00
Lucas Wei
e39d6af2de Merge "Make build support vendor_kernel_boot image" am: 8842016b30 am: 2dc9c52861 am: 3afd8feae8
Original change: https://android-review.googlesource.com/c/platform/build/+/2018599

Change-Id: I6fa0c4681ab6f974c97ac8112ad398de9f62d6a0
2022-03-22 14:33:50 +00:00
Lucas Wei
8842016b30 Merge "Make build support vendor_kernel_boot image" 2022-03-22 13:48:34 +00:00
Roman Kiryanov
b0eac167d9 Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES
The kernel referened is too old and we switched
to the GKI kernel which is located in kernel/prebuilts.

Bug: 225203974
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I02bd9cad70fafcdfda9a7540aa7f05b397023841
2022-03-21 11:18:09 -07:00
Nicolas Geoffray
b6bbdd546c Merge "Add /system/etc/preloaded-classes in the list of files with fsv_meta." am: 412185256f am: d021f26024 am: 802ae18bad
Original change: https://android-review.googlesource.com/c/platform/build/+/2032067

Change-Id: Iccf3ddc80a1f5491da956a5e194d56c39bd1e1c1
2022-03-21 10:06:58 +00:00
Nicolas Geoffray
412185256f Merge "Add /system/etc/preloaded-classes in the list of files with fsv_meta." 2022-03-21 08:35:18 +00:00
Bob Badour
83fd63b3c4 Merge "Add COVERAGE_ZIP to system notice deps." am: d25bf1ec38 am: 8696af283f am: 07b37916f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2032466

Change-Id: Id5aa29aed46f0d676f8419b6cdbf2989dcd71762
2022-03-19 00:41:24 +00:00
Bob Badour
f252972462 Add COVERAGE_ZIP to system notice deps.
Fixes http://b/225282564

Test: lunch gki_arm64-user; make dist

Bug: 225282564
Change-Id: Iba0ea3ee53d3abbce9afff9a005e887ea64f63d1
2022-03-18 11:34:03 -07:00
Nicolas Geoffray
13f2821712 Add /system/etc/preloaded-classes in the list of files with fsv_meta.
Test: m
Bug: 162110941
Change-Id: Idbc0d602bbce9a3cbd68a84f0cc8e2dae05c8c1e
2022-03-18 17:28:14 +00:00
Treehugger Robot
dd780ca8d0 Merge "Notice files and non-module targets." 2022-03-16 20:05:07 +00:00
Colin Cross
27633a0152 Merge "Use Make path for system_linker_config" am: 6dc51855a4 am: c457a49f3a am: 55e2707fc8
Original change: https://android-review.googlesource.com/c/platform/build/+/2027110

Change-Id: I6323bb3ae6998d572bef144b71113540c3a6947f
2022-03-16 18:45:26 +00:00
Colin Cross
6dc51855a4 Merge "Use Make path for system_linker_config" 2022-03-16 17:24:00 +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
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
Bob Badour
ebdefc0c76 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:46:06 -07:00
Treehugger Robot
01907185bc Merge "Clear OS version and patch level fields for GKI boot images" am: 8131404331 am: 40783868d8 am: 6debab1cf8
Original change: https://android-review.googlesource.com/c/platform/build/+/2022898

Change-Id: Id4fc9227b45feb3d3366bfc791bcb9c4c2f3fb7d
2022-03-16 06:53:21 +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
c10c91f138 Merge "More non-module targets." am: 9a21773efe am: da66e2c46d am: 8dd153d008
Original change: https://android-review.googlesource.com/c/platform/build/+/2021235

Change-Id: I614698999fd63b8968f36baea32490ea1b8e4656
2022-03-16 04:05:23 +00:00
Treehugger Robot
9a21773efe Merge "More non-module targets." 2022-03-16 03:15:32 +00:00
Treehugger Robot
fa01103344 Merge "Add ota_extractor to otatools.zip" am: b945cd2890 am: ed3eeff610 am: a060f57ac6
Original change: https://android-review.googlesource.com/c/platform/build/+/2027304

Change-Id: Ic02ed906e025827e8fa66c3d42a4b4e55988958e
2022-03-16 00:23:24 +00:00
Treehugger Robot
b945cd2890 Merge "Add ota_extractor to otatools.zip" 2022-03-15 23:17:20 +00:00
Treehugger Robot
7b5638ba20 Merge "Package llvm-cov in llvm-profdata.zip (take 2)" am: 423e117fa2 am: 5dc3d4f43b am: b815c86cd6
Original change: https://android-review.googlesource.com/c/platform/build/+/2024705

Change-Id: Ic34114d6f123739627c2d2fd228d83b5147f307b
2022-03-15 22:50:41 +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
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
James Chen
408b29216c Merge "Revert "Package llvm-cov in llvm-profdata.zip"" am: 1b8a1490a9 am: fe9c063243 am: 9c185aaed6
Original change: https://android-review.googlesource.com/c/platform/build/+/2026003

Change-Id: I3fd20f925dd4d4b8caf68961991ddf7f1cdb8472
2022-03-15 06:25:46 +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
Pirama Arumuga Nainar
9d55219c48 Merge "Package llvm-cov in llvm-profdata.zip" am: 72815bdf00 am: 25e6cc9560 am: 0f44776802
Original change: https://android-review.googlesource.com/c/platform/build/+/2017370

Change-Id: I68d070d81a2f249fe0ae41edb7c668b994ea52b2
2022-03-14 17:25:36 +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
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
Treehugger Robot
886ae7e4db Merge "Sundry non-module targets" am: 2684184530 am: c61946a84b am: 7fe2fe6327
Original change: https://android-review.googlesource.com/c/platform/build/+/2019377

Change-Id: I932b7ffa19c96cc41a383f13d1fb990770eaab5f
2022-03-10 14:12:32 +00:00
Treehugger Robot
2684184530 Merge "Sundry non-module targets" 2022-03-10 13:01:40 +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
David Anderson
d15d508196 Merge "build_image: Remove mkerofsimage.sh." am: 060505fb4a am: c836e2e090 am: 0a132b5e2f
Original change: https://android-review.googlesource.com/c/platform/build/+/2008730

Change-Id: Ie7406b2257a96d04587b6117d038f058c76e785b
2022-03-09 11:20:29 +00: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
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
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
Yi-yo Chiang
848c69ac7c Merge changes from topic "gki-avb-vts" am: 9d164b6300 am: e93bc67cf8 am: 4e8705b181
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: I52ab0dc87855a1822bdb50d014544cecf67d7431
2022-03-01 05:57:34 +00:00
Yi-yo Chiang
9d164b6300 Merge changes from topic "gki-avb-vts"
* changes:
  releasetools: Update T GKI certification scheme
  Update T GKI certification scheme
2022-03-01 04:47:47 +00:00
Treehugger Robot
05df4593f6 Merge "Remove ostensibly unused host tools notice." am: 1420aa099a am: 67ce808a50 am: 71530d3fee
Original change: https://android-review.googlesource.com/c/platform/build/+/2000192

Change-Id: Ia35f77857335f5368c4e70bbdecb3813790fc4e4
2022-02-25 19:55:27 +00:00
Treehugger Robot
1420aa099a Merge "Remove ostensibly unused host tools notice." 2022-02-25 18:30:02 +00:00
Jooyung Han
dc24373bc8 Merge "Replace pvmfw embedded public key" am: 4d0af554ce am: 474339443f am: ba28c6a1f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1990892

Change-Id: I3a4aa38e87bff56823e4b395af688964aa5260da
2022-02-25 07:52:54 +00:00
Jooyung Han
4d0af554ce Merge "Replace pvmfw embedded public key" 2022-02-25 06:39:20 +00:00
Bob Badour
e0eb7e8e38 Remove ostensibly unused host tools notice.
Bug: 151177513

Test: m nothing reportmissinglicenses

Change-Id: Ia33d024bca5262a983b031c2751e7a14c501236e
2022-02-24 18:36:12 -08:00
Yi-Yo Chiang
2f7a108bf2 Update T GKI certification scheme
* Remove 'generic_ramdisk' certification, as we are not certifying
  'init_boot' anymore.
* Add a new 'boot' certificate that certifies the whole boot.img.
* The new 'boot' & existing 'generic_kernel' certificates are directly
  appended at the end of the boot.img, and the mkbootimg
  --boot_signature argument is removed.

Bug: 211741246
Test: m bootimage
Test: ./boot_signature_info.sh boot-5.10.img
Change-Id: I143680b1cab50a6915df56c8273f8741beaf1180
2022-02-24 21:47:51 +08:00
Treehugger Robot
60d85b4cee Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" am: 3f852994b4 am: fb9c2f2205 am: cc08c91fa8
Original change: https://android-review.googlesource.com/c/platform/build/+/1993718

Change-Id: Iac65ded6e2f65bc1c2a13af61b90a6cebdfa6c76
2022-02-23 17:33:05 +00:00
Andrew Scull
bbc930b008 Replace pvmfw embedded public key
The virt APEX payload public key needs to be embedded in pvmfw so that
is verifies the right set of images. As things are being resigned,
update that embedded key so that it matches the APEX.

Bug: 220018566
Test: sign_target_files_apks
Change-Id: I09be91275ec1d1aa6f921c54a96c5159571ddead
2022-02-23 16:27:57 +00:00