From 0351d9da612a92329c3a450b6cd020dd62c6c4fa Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Tue, 29 Jun 2021 15:27:09 +0800 Subject: [PATCH] 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 --- target/board/generic_arm64/BoardConfig.mk | 2 ++ target/board/generic_arm64/device.mk | 13 +++++++------ target/board/generic_x86_64/device.mk | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 21b4065487..1133564619 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -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 \ diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 27dc158fbd..0064aecadc 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -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 diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index e195bd3fad..f31a49155b 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -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