Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0351d9da authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Include kernel-*-allsyms into boot-*-allsyms.img 

The patch fixes the boot-*-allsyms.img of gsi_arm64-userdebug to
pack the kernel with allsyms instead of without allsyms.

Bug: 192318869
Test: build gsi_arm64-userdebug; check the kernel in boot-*-allsyms.img
Test: build gsi_x86_64-userdebug; check the kernel in boot-*-allsyms.img
Change-Id: Ic89dbe27e166d57283c7bef574d525863d20e79f
parent cba3ec78

target/board/generic_arm64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ include build/make/target/board/BoardConfigGsiCommon.mk 
include build/make/target/board/BoardConfigGkiCommon.mk



BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-4.19-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
@@ -82,6 +83,7 @@ BOARD_KERNEL_BINARIES := \ 


ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

BOARD_KERNEL_BINARIES += \

    kernel-4.19-gz-allsyms \

    kernel-5.4-allsyms kernel-5.4-gz-allsyms kernel-5.4-lz4-allsyms \

    kernel-5.10-allsyms kernel-5.10-gz-allsyms kernel-5.10-lz4-allsyms \

target/board/generic_arm64/device.mk

+7 −6
Original line number Diff line number Diff line
@@ -33,12 +33,13 @@ $(call dist-for-goals, dist_files, kernel/prebuilts/mainline/arm64/prebuilt-info 


ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

PRODUCT_COPY_FILES += \

    kernel/prebuilts/5.4/arm64/kernel-5.4:kernel-5.4-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-gz:kernel-5.4-gz-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10:kernel-5.10-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10-gz:kernel-5.10-gz-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10-lz4:kernel-5.10-lz4-allsyms \

    kernel/prebuilts/4.19/arm64/kernel-4.19-gz-allsyms:kernel-4.19-gz-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-allsyms:kernel-5.4-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-gz-allsyms:kernel-5.4-gz-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-lz4-allsyms:kernel-5.4-lz4-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10-allsyms:kernel-5.10-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10-gz-allsyms:kernel-5.10-gz-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10-lz4-allsyms:kernel-5.10-lz4-allsyms \



endif

target/board/generic_x86_64/device.mk

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ $(call dist-for-goals, dist_files, kernel/prebuilts/5.10/x86_64/prebuilt-info.tx 


ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

PRODUCT_COPY_FILES += \

    kernel/prebuilts/5.4/x86_64/kernel-5.4:kernel-5.4-allsyms \

    kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel-5.10-allsyms \

    kernel/prebuilts/5.4/x86_64/kernel-5.4-allsyms:kernel-5.4-allsyms \

    kernel/prebuilts/5.10/x86_64/kernel-5.10-allsyms:kernel-5.10-allsyms \



endif