From 239b3e9cdaa980c64eb8698ea3821aa46985b2e3 Mon Sep 17 00:00:00 2001
From: SzuWei Lin <szuweilin@google.com>
Date: Fri, 22 Apr 2022 13:05:30 +0800
Subject: Unfold the result of output-kernel

The number of file kernel versions and output files are not reduced.
We don't need output-kernel now.

Bug: 230047219
Test: TH with gki_arm64 and gki_x86_64
Change-Id: I7d74595dce9e398990ea08ed805ce0bb81df7f97
(cherry picked from commit ceb6b290af57b33217128c93325303a84ec77c64)
---
 gki_common.mk | 68 -----------------------------------------------------------
 1 file changed, 68 deletions(-)

(limited to 'gki_common.mk')

diff --git a/gki_common.mk b/gki_common.mk
index 1d301c0..42b9a6c 100644
--- a/gki_common.mk
+++ b/gki_common.mk
@@ -14,74 +14,6 @@
 # limitations under the License.
 #
 
-# The files will be copy from the source folder to the dist folder
-_output-kernel-info-files := \
-    prebuilt-info.txt \
-    manifest.xml \
-
-
-# Copy the files from the source folder to the dist folder
-#
-# Skip if the file is not existing.
-#
-# $(1): file list
-# $(2): the source folder
-# $(3): the dist folder
-define _output_kernel_files
-$(foreach f,$(1), \
-  $(if $(wildcard $(2)/$(f)), \
-    $(call dist-for-goals,dist_files,$(2)/$(f):$(3)/$(f))))
-endef
-
-
-# Output the release kernel prebuilt files to dist folder
-#
-# $(1): the source folder contains the kernel prebuilt files
-#
-# Notes:
-#   For mainline kernel, it outputs -allsyms kernel as release kernel.
-#
-define _output-kernel-user
-$(if $(findstring mainline,$(1)), \
-  $(eval PRODUCT_COPY_FILES += \
-    $(foreach f,$(wildcard $(1)/kernel-*-allsyms), \
-      $(f):$(subst -allsyms,,$(notdir $(f))))), \
-  $(eval PRODUCT_COPY_FILES += \
-    $(call copy-files,$(filter-out *-allsyms,$(wildcard $(1)/kernel-*)),.)))
-endef
-
-
-# Output the debug kernel prebuilt files to dist folder
-#
-# $(1): the source folder contains the kernel prebuilt files
-#
-# Note:
-#   For mainline kernel, it outputs -allsyms kernel as release kernel,
-#   so there is no need to output -allsyms again.
-#
-define _output-kernel-debug
-$(if $(findstring mainline,$(1)),, \
-  $(eval PRODUCT_COPY_FILES += \
-    $(call copy-files,$(wildcard $(1)/kernel-*-allsyms),.)))
-endef
-
-
-# Output the kernel prebuilt files to dist folder
-#
-# $(1): the source folder contains the kernel prebuilt files
-# $(2): the dist folder
-#
-# Example:
-#  $(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10)
-#
-define output-kernel
-$(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
-
 #
 # Output boot.img
 #
-- 
cgit v1.2.3