From 2ad32ef3af8a5bf71d0509a6f42d8d3c8e85a911 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Mon, 17 Aug 2020 15:16:30 -0700 Subject: [PATCH] add kernels with untrimmed symbols to aosp_arm64 For development and debugging it is useful to have boot images with all kernel symbols exported. Bug: 163613927 Change-Id: I6118e5f0fff6e9cbc20ecca6bd362a26a79544b1 --- target/board/generic_arm64/BoardConfig.mk | 6 ++++++ target/board/generic_arm64/device.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 22108fab7f..2f4154030e 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -59,8 +59,11 @@ TARGET_NO_VENDOR_BOOT := true BOARD_USES_RECOVERY_AS_BOOT := true 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 +BOARD_KERNEL-5.4-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920 BOARD_KERNEL-5.4-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 +BOARD_KERNEL-5.4-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376 BOARD_KERNEL-MAINLINE_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_KERNEL-MAINLINE-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 BOARD_KERNEL-MAINLINE-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 @@ -72,6 +75,9 @@ BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_KERNEL_BINARIES := kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \ kernel-mainline kernel-mainline-gz kernel-mainline-lz4 +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +BOARD_KERNEL_BINARIES += kernel-5.4-allsyms kernel-5.4-gz-allsyms kernel-5.4-lz4-allsyms +endif # Some vendors still haven't cleaned up all device specific directories under # root! diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index d8d06cd30a..dfa146ac3b 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -21,3 +21,10 @@ PRODUCT_COPY_FILES += \ kernel/prebuilts/mainline/arm64/kernel-mainline:kernel-mainline \ kernel/prebuilts/mainline/arm64/kernel-mainline-gz:kernel-mainline-gz \ kernel/prebuilts/mainline/arm64/kernel-mainline-lz4:kernel-mainline-lz4 + +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +PRODUCT_COPY_FILES += \ + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4-allsyms \ + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz-allsyms \ + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms +endif