diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-14 09:16:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-14 09:16:51 +0000 |
| commit | 651889db878c8fdc02c1c9facb6a81b6bbe3ad8d (patch) | |
| tree | 9c0de3a835b9f5703446c87933734f2f41f6239c | |
| parent | a29883d0224ad629b3cb48729ffbb21fd0cfeeae (diff) | |
| parent | c872455d1d1fe8bf2009b6439776204d15c92204 (diff) | |
| download | common-651889db878c8fdc02c1c9facb6a81b6bbe3ad8d.tar.gz | |
Merge "Output debug kernel prebuilt files to dist kernel/*-debug folder" am: eec923d0ed am: c872455d1d
Original change: https://android-review.googlesource.com/c/device/generic/common/+/2020596
Change-Id: Id1103ee0668e1ce464cefd5d3cd72573ee0691ef
| -rw-r--r-- | gki_common.mk | 9 |
1 files 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 # |