diff options
| author | Isaac J. Manjarres <isaacmanjarres@google.com> | 2024-02-07 18:30:08 -0800 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-02-22 02:06:31 +0000 |
| commit | ab54ee86d308bbe6f704a7acbf97b84f34b53b6e (patch) | |
| tree | bd3186eaa83a027c4bf87c9fb3087ae77025c358 | |
| parent | c13eaae3533e36043745bc547659d8b32da67892 (diff) | |
| download | build-ab54ee86d308bbe6f704a7acbf97b84f34b53b6e.tar.gz | |
kleaf: Do not generate vendor[_kernel]_boot.modules.* unless required
Commit d08605f4c795 ("kleaf: Add support for specifying modules for
recovery/charger") accidentally made it so that kleaf always tries
to generate the vendor[_kernel]_boot.modules.* lists, even when
neither vendor_boot.img or vendor_kernel_boot.img need to be built.
Fix this by only attempting to generate those artifacts if either
vendor_boot.img or vendor_kernel_boot.img need to be built.
Bug: 324304750
Fixes: d08605f4c795 ("kleaf: Add support for specifying modules for recovery/charger")
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:100076d823899780662a6fdec71f92be35f6d9f7)
Merged-In: I31ec16fc543e55f33319e017c7d5976e825f581d
Change-Id: I31ec16fc543e55f33319e017c7d5976e825f581d
| -rw-r--r-- | kleaf/impl/image/kernel_images.bzl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kleaf/impl/image/kernel_images.bzl b/kleaf/impl/image/kernel_images.bzl index 01e6ee0f..7e9dcba6 100644 --- a/kleaf/impl/image/kernel_images.bzl +++ b/kleaf/impl/image/kernel_images.bzl @@ -360,13 +360,14 @@ def kernel_images( vendor_boot_modules_load_recovery = None vendor_boot_modules_load_charger = None if build_initramfs: - vendor_boot_modules_load = "{}_initramfs/{}.modules.load".format(name, vendor_boot_name) + if vendor_boot_name: + vendor_boot_modules_load = "{}_initramfs/{}.modules.load".format(name, vendor_boot_name) - if modules_recovery_list: - vendor_boot_modules_load_recovery = "{}_initramfs/{}.modules.load.recovery".format(name, vendor_boot_name) + if modules_recovery_list: + vendor_boot_modules_load_recovery = "{}_initramfs/{}.modules.load.recovery".format(name, vendor_boot_name) - if modules_charger_list: - vendor_boot_modules_load_charger = "{}_initramfs/{}.modules.load.charger".format(name, vendor_boot_name) + if modules_charger_list: + vendor_boot_modules_load_charger = "{}_initramfs/{}.modules.load.charger".format(name, vendor_boot_name) if ramdisk_compression_args and ramdisk_compression != "lz4": fail( |