From bb034031a1a773b730797a6c561d151f3daae8ad Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Mon, 14 Mar 2022 13:58:35 +0800 Subject: Output debug kernel prebuilt files to dist kernel/*-debug folder Bug: 212486689 Test: lunch gki_arm64-userdebug; make -j dist; check out/dist Change-Id: Ib6e7f395cad54b7ee94ec42ce281e4d343d3f1cc --- gki_common.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gki_common.mk b/gki_common.mk index 4e21af1..1d301c0 100644 --- a/gki_common.mk +++ b/gki_common.mk @@ -37,7 +37,6 @@ endef # Output the release kernel prebuilt files to dist folder # # $(1): the source folder contains the kernel prebuilt files -# $(2): the dist folder # # Notes: # For mainline kernel, it outputs -allsyms kernel as release kernel. @@ -55,7 +54,6 @@ endef # Output the debug kernel prebuilt files to dist folder # # $(1): the source folder contains the kernel prebuilt files -# $(2): the dist folder # # Note: # For mainline kernel, it outputs -allsyms kernel as release kernel, @@ -77,10 +75,11 @@ endef # $(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10) # define output-kernel -$(call _output-kernel-user,$(1),$(2)) -$(if $(filter userdebug eng,$(TARGET_BUILD_VARIANT)), \ - $(call _output-kernel-debug,$(1),$(2))) +$(call _output-kernel-user,$(1)) $(call _output_kernel_files,$(_output-kernel-info-files),$(1),$(2)) +$(if $(filter userdebug eng,$(TARGET_BUILD_VARIANT)), \ + $(call _output-kernel-debug,$(1)) \ + $(call _output_kernel_files,$(_output-kernel-info-files),$(1),$(2)-debug)) endef # -- cgit v1.2.3