From eca9a1a9c09cbfde2fc2b5667e3ff4890f81694a Mon Sep 17 00:00:00 2001
From: HONG Yifan <elsk@google.com>
Date: Thu, 12 Sep 2024 16:47:53 -0700
Subject: [PATCH] ANDROID: Delete FILES from build configs.

Kleaf builds does not read the FILES variable. Instead, it relies on
kernel_build.*outs attributes to determine what files to be copied
from Kbuild's out directory.

Test: TH
Bug: 236012223
Change-Id: I20058736e4be80a086cc5f87653374531bc916f8
Signed-off-by: HONG Yifan <elsk@google.com>
---
 build.config.aarch64     |  9 ---------
 build.config.arm         |  6 ------
 build.config.db845c      | 11 -----------
 build.config.gki.aarch64 |  5 -----
 build.config.rockpi4     |  4 ----
 build.config.x86_64      |  9 ---------
 6 files changed, 44 deletions(-)

diff --git a/build.config.aarch64 b/build.config.aarch64
index ac192501dd54..65fad149c78d 100644
--- a/build.config.aarch64
+++ b/build.config.aarch64
@@ -4,13 +4,4 @@ Image
 modules
 "
 
-FILES="
-arch/arm64/boot/Image
-vmlinux
-System.map
-vmlinux.symvers
-modules.builtin
-modules.builtin.modinfo
-"
-
 NDK_TRIPLE=${AARCH64_NDK_TRIPLE}
diff --git a/build.config.arm b/build.config.arm
index 4d6fa4cd885f..bab988b26a8f 100644
--- a/build.config.arm
+++ b/build.config.arm
@@ -4,10 +4,4 @@ zImage
 modules
 "
 
-FILES="
-arch/arm/boot/zImage
-vmlinux
-System.map
-"
-
 NDK_TRIPLE=${ARM_NDK_TRIPLE}
diff --git a/build.config.db845c b/build.config.db845c
index cc6030518d8f..09dfe2cf0279 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -8,14 +8,3 @@ PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
 DTC_FLAGS="${DTC_FLAGS} -@"
-
-FILES="
-arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
-arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
-arch/arm64/boot/dts/qcom/sm8450-hdk.dtb
-arch/arm64/boot/dts/qcom/sm8450-qrd.dtb
-arch/arm64/boot/dts/qcom/sm8550-hdk.dtb
-arch/arm64/boot/dts/qcom/sm8550-qrd.dtb
-arch/arm64/boot/dts/qcom/sm8650-hdk.dtb
-arch/arm64/boot/dts/qcom/sm8650-qrd.dtb
-"
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index d3980621c116..08eca72d90cf 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -2,11 +2,6 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 
-FILES="${FILES}
-arch/arm64/boot/Image.lz4
-arch/arm64/boot/Image.gz
-"
-
 BUILD_SYSTEM_DLKM=1
 
 BUILD_GKI_CERTIFICATION_TOOLS=1
diff --git a/build.config.rockpi4 b/build.config.rockpi4
index 15c10c39f41e..9853bff1325c 100644
--- a/build.config.rockpi4
+++ b/build.config.rockpi4
@@ -12,7 +12,3 @@ POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG
 
 DTS_EXT_DIR=common-modules/virtual-device
 DTC_INCLUDE=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/boot/dts/rockchip
-
-FILES="${FILES}
-../common-modules/virtual-device/rk3399-rock-pi-4b.dtb
-"
diff --git a/build.config.x86_64 b/build.config.x86_64
index 5577460ac788..5390590efd23 100644
--- a/build.config.x86_64
+++ b/build.config.x86_64
@@ -4,13 +4,4 @@ bzImage
 modules
 "
 
-FILES="
-arch/x86/boot/bzImage
-vmlinux
-System.map
-vmlinux.symvers
-modules.builtin
-modules.builtin.modinfo
-"
-
 NDK_TRIPLE=${X86_64_NDK_TRIPLE}