Commit Graph

3836 Commits

Author SHA1 Message Date
Cole Faust
fb6782d850 Merge "Revert "symlink_outputs: Add .KATI_SYMLINK_OUTPUTS to build/make..."" into main am: a4e395b2af am: b8cf62ed08
Original change: https://android-review.googlesource.com/c/platform/build/+/2917989

Change-Id: I840e7bee489d79333e9a0c0b722b9b1f7414ce9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 20:40:43 +00:00
Cole Faust
a4e395b2af Merge "Revert "symlink_outputs: Add .KATI_SYMLINK_OUTPUTS to build/make..."" into main 2024-01-19 19:38:57 +00:00
Inseob Kim
3743c8dcf0 Merge "Remove LOCAL_FILE_CONTEXTS" into main am: 2f7809b437 am: a8c3db9dc3
Original change: https://android-review.googlesource.com/c/platform/build/+/2915726

Change-Id: I361758be405cb379e8e3d4fcda81bff805e682a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 02:58:56 +00:00
Cole Faust
8f2283e6f2 Revert "symlink_outputs: Add .KATI_SYMLINK_OUTPUTS to build/make..."
Revert submission 1433935-symlink_outputs

Reason for revert: symlink_outputs was added so bazel could run ninja files, but we abanoned that approach in roboleaf, and then roboleaf was cancelled entirely. Remove this feature so we're more compatible with upstream ninja / n2.

Reverted changes: /q/submissionid:1433935-symlink_outputs

Change-Id: I5a779695689148ed32037f7f82887c458a3587cd
2024-01-18 20:12:12 +00:00
Inseob Kim
7b06c6918e Remove LOCAL_FILE_CONTEXTS
It's not used anymore.

Bug: N/A
Test: TH
Change-Id: Ib61922add91ad07e2c28b0950117470e5435ab34
2024-01-18 12:33:02 +09:00
Seungjae Yoo
7d5a984ad6 Merge "Append root digest information of microdroid vendor into vendor.img" into main am: a79329678d am: d53dd61fe9 am: b9f308c10b
Original change: https://android-review.googlesource.com/c/platform/build/+/2877541

Change-Id: Iceefd30978eda0d661ce42e262995567611d5e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 03:00:41 +00:00
Seungjae Yoo
939d37b88c Append root digest information of microdroid vendor into vendor.img
Instead appending public key information into vendor partition,
append root digest of microdroid-vendor's hashtree descriptor. The root
digest would be extracted in build time with avbtool.

Bug: 285855436
Test: avbtool info_image --image $ANDROID_PRODUCT_OUT/vendor/etc/avf/microdroid/microdroid_vendor.img
Test: avbtool info_image --image $ANDROID_PRODUCT_OUT/vendor.img
Change-Id: I930b09774a1024a2e5d30f474f1589fc1b8aa25a
2023-12-26 17:21:41 +09:00
Julien Desprez
c520c6a119 Merge "Use sha256 when zipping target_files" into main am: 2538c86562 am: c89956a3e5 am: 57ecf17d23
Original change: https://android-review.googlesource.com/c/platform/build/+/2881406

Change-Id: I7ba502dff28e251e6826ad0dc65381f753e3dd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 04:25:38 +00:00
Julien Desprez
eebf6dcd1a Use sha256 when zipping target_files
similar to general-tests.mk, this will avoid recomputing sha256 when
uploading target files to RBE.

Test: presubmit
Bug: 316952196
Change-Id: I879214ac79f5c269f337fafcede8513c1e90e60e
2023-12-18 22:39:04 +00:00
Dmitrii Merkurev
aa069668d3 Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893a0 am: 9f2bf543b9 am: fd02c7660b
Original change: https://android-review.googlesource.com/c/platform/build/+/2875335

Change-Id: Iac8bba0df1f95b6aa7f8978097b422d19bfcb85f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 19:55:38 +00:00
Dmitrii Merkurev
901136e9d8 Revert "Revert "Allow to override fastboot-info.txt for specific..."
Revert submission 2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Reason for revert: Some images weren't available in Android.mk

Reverted changes: /q/submissionid:2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Bug: 315866782
Test: confirmed bluejay abtd build has correct fastboot-info.txt

Change-Id: Id75d879119744ab97225e5a551e8d32a1b09a356
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-12-14 13:27:38 +00:00
Dan Shi
f877c1c7c4 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a am: 17391cba39
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I370421e6e101b3e5f078a6a7b86dc745ce7164b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13 20:55:05 +00:00
Dan Shi
e8519a7bad Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main 2023-12-13 19:19:16 +00:00
Dan Shi
16490d3207 Revert "Allow to override fastboot-info.txt for specific board"
Revert submission 2871156-fastboot_info

Reason for revert: possble cause of b/315866782

Reverted changes: /q/submissionid:2871156-fastboot_info

Change-Id: I07baf20bd50529a36f2841350a24ba58d480f5e2
2023-12-13 18:58:49 +00:00
Dmitrii Merkurev
d63d6a7adb Merge "Allow to override fastboot-info.txt for specific board" into main am: aaf82ff626 am: 47abe8a42e am: a2191b0e4a
Original change: https://android-review.googlesource.com/c/platform/build/+/2871235

Change-Id: I607579e81d21af5982fc247bda504e245b84a128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13 04:25:17 +00:00
Dmitrii Merkurev
aaf82ff626 Merge "Allow to override fastboot-info.txt for specific board" into main 2023-12-13 02:56:12 +00:00
Dmitrii Merkurev
21eeb06291 Allow to override fastboot-info.txt for specific board
Introduce TARGET_BOARD_FASTBOOT_INFO_FILE to override
fastboot-info.txt generated by default

Test: locally with CF target on related change
Bug: 315811289
Change-Id: I52208e49ac1dfe8558849be9befa60df805665e3
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-12-12 22:10:32 +00:00
Treehugger Robot
8f88a559f7 Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main am: e47f6ffa2b am: cc2c31d146 am: af2d42d3b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2855527

Change-Id: I72142fd6b467184979f487a50a5a0c9c6c276c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:54:48 +00:00
Seungjae Yoo
6b73d7f9ed Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main am: 5d034ba5c0 am: 9b83205f41 am: 6e4090f51e
Original change: https://android-review.googlesource.com/c/platform/build/+/2856828

Change-Id: I7e3b8416668cd587b20124e8f9c604fd57785210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:54:22 +00:00
Treehugger Robot
e47f6ffa2b Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main 2023-12-05 05:47:09 +00:00
Seungjae Yoo
e68d922118 Append pubkey of microdroid-vendor into avb prop of vendor_boot
For protected VM in AVF, the public key of microdroid-vendor partition
should be passed via trustable way. However, pvmfw config data is
constructed from ABL. AVB property is needed to pass the public key from
the source code into ABL, determined in the build time.

Bug: 285854379
Test: avbtool info_image --image $ANDROID_PRODUCT_OUT/vendor_boot.img
Change-Id: I024d1d835cccb27feef1164aca30712dbb8a70da
2023-12-05 12:17:46 +09:00
Jooyung Han
a7bb8532f6 Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb
STUB_LIBRARIES lists all stub libraries including "system" libraries.
There can be a library that provides "stub" only for "system" variant
while its vendor variant doesn't. (e.g. libz). In such cases, using
STUB_LIBRARIES will result a wrong "provide" list in
vendor/etc/linker.config.pb.

So, instead, use SOONG_STUB_VENDOR_LIBRARIES which only lists stub
libraries that are installed in /vendor.

Bug: 313806237
Test: m & cvd start
Test: $OUT/vendor/etc/linker.config.pb doesn't list libz.so
Change-Id: If0f2089594bda5f799fd495f80a27493553cb4e1
2023-12-01 16:39:48 +09:00
Daniel Rosenberg
71dc8825e0 Merge "Add support for different F2FS block sizes" into main am: 5514a5aaf6 am: 53661d57b2 am: 2c67335b45
Original change: https://android-review.googlesource.com/c/platform/build/+/2835796

Change-Id: Icf06290f0f9d86b6c9343437806bfa5aa0e8f74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 02:02:07 +00:00
Daniel Rosenberg
5514a5aaf6 Merge "Add support for different F2FS block sizes" into main 2023-11-30 00:24:46 +00:00
Yi-Yo Chiang
24c9ebadb9 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9 am: 3637989aa1 am: cde8985c82
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155

Change-Id: I93d2a5147110d5a6364fc9f2f3f4b276b3b474b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 04:10:27 +00:00
Yi-Yo Chiang
3eb926b196 Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main am: 5366754f62 am: 0687b5d4ef am: 5fc61e1d9b
Original change: https://android-review.googlesource.com/c/platform/build/+/2846153

Change-Id: I80e5022586c47a328ac8f6a266784e5ba6c6eef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 02:14:25 +00:00
Daniel Rosenberg
d9a520c5bd Add support for different F2FS block sizes
F2FS has been expanded to allow for different block sizes. Currently the
block size must be the same as page size, but this may change in the
future. This gives support for 16K while not restricting the ability to
choose a block size that isn't based on the page size later on.

Bug: 279820706
Test: Boot 16k F2FS device
Change-Id: I4e025d83a5e5ad03d89bc80b02fea390c2cbad69
2023-11-27 18:09:18 -08:00
Yi-Yo Chiang
d6f568f587 Deprecate BOARD_GKI_SIGNING_* vars and build rules
These were for building and signing GKIs in the platform tree.
We are no longer building GKIs this way, so remove these dead build
rules.

Bug: 229701033
Test: presubmit
Change-Id: I0b807de1407988489e994ec5a0da282616ac1af1
2023-11-28 09:31:47 +08:00
Yi-Yo Chiang
f061800468 Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
These variables are no longer used. We don't build GKI in the platform
tree anymore. Remove these vars as we are not maintaining these.

Bug: 229701033
Test: presubmit
Change-Id: If8c978a07094da6a651c1e3f06a437dea9ef52b9
2023-11-24 15:04:33 +08:00
Treehugger Robot
a59bc6afe2 Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080d6 am: 2718d6a4f3 am: 986d9d184c
Original change: https://android-review.googlesource.com/c/platform/build/+/2768738

Change-Id: I7a15c8ad1539daea36516b96f14e869678d24816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 01:45:07 +00:00
Kelvin Zhang
65c1162eb5 Generate incremental OTAs for 16K/4K boot option
Previously, the 16K/4K boot options OTAs are full OTAs, resulting in
file size of ~20MB each, and ~40M for both OTAs. To reduce the space
usage, use incremental OTAs instead.

Test: th
Bug: 302759296
Bug: 293313353
Change-Id: I61cc84c6c13f151dd6bc5ff37dd31daa5fb31abd
2023-11-06 12:37:49 -08:00
Jooyung Han
cebed823e8 Merge "Rewrite how to generate apexkeys.txt" into main am: aea4c9d496 am: 8fdb9fb3e3 am: de68362036
Original change: https://android-review.googlesource.com/c/platform/build/+/2809200

Change-Id: I631064bd258754759f7a47a63c9741dcaf92d93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 06:39:53 +00:00
Jooyung Han
aea4c9d496 Merge "Rewrite how to generate apexkeys.txt" into main 2023-11-01 05:13:06 +00:00
Jooyung Han
8b162283f7 Rewrite how to generate apexkeys.txt
Instead of listing all apexes in the source tree, now each apex emits
its own fragment for apexkeys.txt, which is pointed by
LOCAL_APEX_KEYS_FILE. Makefile collects apexkeys.txt from installed apex
files. This is to avoid listing unrelated apexes (not installed,
testdata, unexported namespaces, etc.)

Bug: 304914238
Test: m apexkeys.txt
Test: m blueprint-tests
Change-Id: I6b5601609d16452a0717f09ecaa703ee09693094
2023-11-01 13:06:08 +09:00
Treehugger Robot
d07b60ee71 Merge "Add a phony target for mk2bp_remaining files." into main am: 4c56f45c50 am: b40c808d89 am: b597067044
Original change: https://android-review.googlesource.com/c/platform/build/+/2809898

Change-Id: Id938ed38cd1e3dec65001d98df1a44fac0e01445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:40:19 +00:00
Wei Li
2e84027864 Add a phony target for mk2bp_remaining files.
Bug: 308452586
Test: m mk2bp_remaining; CIs
Change-Id: I3d9242db500232da281f148da6b8205ada0b72e2
2023-10-30 11:20:13 -07:00
Treehugger Robot
499cb3476b Merge "De-duplicate kernel module names" into main am: a997e48000 am: da7e14b9e5 am: cf0c76fa0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I84433b84a581029fec8e72fa640b4d1620ace7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 20:33:35 +00:00
Kelvin Zhang
57f23bf317 De-duplicate kernel module names
If BOARD_KERNEL_MODULES_16K contains duplicate kernel modules under
different directories, build will fail with 'multiple overriding
commands error' . To fix it, de-dup BOARD_KERNEL_MODULES_16K base on the
basename of kernel modules files.

Test: th
Change-Id: I45d850d5b3804c54b9ec0133d3a657c2db5adb17
2023-10-26 10:29:55 -07:00
Treehugger Robot
21bc61ebea Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main am: 07f84b7b17 am: fa0091a912 am: fa58c8aa2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2794713

Change-Id: I2385f7fe7f558458b8af2b388a929b6e4448f6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 22:55:10 +00:00
Kelvin Zhang
160762a276 Use deterministic salt for AVB footer of prebuilt boot img
When target specified a prebuilt boot.img, current build system will add
avb hash footer to it with a random salt. Use a deterministic salt
instead for more reproducible builds. To stay consistent with
non-prebuilt boot.img code path, we extract the kernel image from
prebuilt boot.img and uses sha256sum of kernel image as the salt.

Test: th
Bug: 293313353
Change-Id: I988999ddc4f18e0b8677b05a3165c847b6a11b52
2023-10-25 13:28:11 -07:00
Wei Li
a7b3da9771 Merge "Add key character maps to layoutlib dist files" into main am: b3731e0db2 am: e8f77226d0 am: 21eaff44ad
Original change: https://android-review.googlesource.com/c/platform/build/+/2802643

Change-Id: Iae7a953146c47a6d4f695574d72ff6eaa8170722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 18:59:42 +00:00
Jerome Gaillard
ea9dab478c Add key character maps to layoutlib dist files
This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1894ff5c78ca33be85d983d28be42870bac0bed0)
Merged-In: I147159912f85daafc97364468d6a6c2cfa3916b8
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in core/Makefile, hunk HunkHeader[7006,8->7006,8]: Hunk cannot be applied

Original patch:
 From 1894ff5c78ca33be85d983d28be42870bac0bed0 Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Mon, 24 Oct 2022 16:30:25 +0100
Subject: [PATCH] Add key character maps to layoutlib dist files

This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8
---
2023-10-25 01:15:53 +00:00
Sandeep Dhavale
a422d2858d Merge "Add support for specifying erofs blocksize" into main am: cc1a560241 am: ffc0e25f2b am: 5d6a4278b0
Original change: https://android-review.googlesource.com/c/platform/build/+/2795057

Change-Id: I91f5e641a8af4eaf049127692edf510e9cba04d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:23:09 +00:00
Sandeep Dhavale
d7cc7e8f9a Add support for specifying erofs blocksize
This change allows us to specify erofs filesystem block size
which will be used to create erofs image.

Either it can be specified at board level using
BOARD_EROFS_BLOCKSIZE. Or per read only partition image
using BOARD_<PARTITION>IMAGE_EROFS_BLOCKSIZE.

Examples:
BOARD_EROFS_BLOCKSIZE := 16384 OR
BOARD_PRODUCTIMAGE_EROFS_BLOCKSIZE := 16384

Bug: 303316443
Test: m and file ${ANDROID_PRODUCT_OUT}/*.img

Change-Id: I9bf3d299ae02165d0bffc62f474a302408d8b9b9
Signed-off-by: Sandeep Dhavale <dhavale@google.com>
2023-10-18 08:23:36 -07:00
Treehugger Robot
d83c1d2b82 Merge "Revert "Add a check that the staging directories don't..."" into main am: 0968914e2c am: 61d7773abb am: 6c4037c3c7 am: 3c646092e6 am: f4473e5411
Original change: https://android-review.googlesource.com/c/platform/build/+/2787170

Change-Id: Id746637b4ed18c5b1d7bcf5065b591a4af2ef1e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 08:27:58 +00:00
Treehugger Robot
0968914e2c Merge "Revert "Add a check that the staging directories don't..."" into main 2023-10-13 05:32:56 +00:00
Cole Faust
be5e391055 Revert "Add a check that the staging directories don't..."
Revert submission 2773149-partition_file_list_check

Reason for revert: b/305103467, b/305103783, b/305103468
Reverted changes: /q/submissionid:2773149-partition_file_list_check

Change-Id: I2fab3b4d7d24af4488e777ad84e12e280c42dcc0
2023-10-13 02:51:10 +00:00
Treehugger Robot
04f81e39fb Merge "Skip stripping 16K GKI kernel modules" into main am: c187d5052b am: f40afd580c am: 67628ae37e am: 04530c919e am: c3225865dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2779729

Change-Id: I09b2e9e11703fee5f3ed1bb216f451c4b9484924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 21:24:10 +00:00
Cole Faust
ffe322e44e Merge "Add a check that the staging directories don't..." into main am: fe455d1c0c am: 392731880a am: 3603e837fb am: 95cd8fb9a6 am: 546446e916
Original change: https://android-review.googlesource.com/c/platform/build/+/2773149

Change-Id: I54807617a981bc0d9addae111af09d707f935c2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 19:31:34 +00:00
Kelvin Zhang
ad3c30528d Skip stripping 16K GKI kernel modules
GKI kernel modules are required to be signed, but curretnly we strip all
16K kernel modules. Use SYSTEM_DLKM_MODULE_PATTERNS to determine which
modules are GKI, and skip stripping for these kernel modules.

Test: boot using 16K boot image
Bug: 303725887

Change-Id: I4cd71b39ceb75650d03744220ec4ddf4aeeda871
2023-10-12 10:31:44 -07:00