From a8a61755f67730af45d50f6173a4eedbcefa1c87 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 16 Jun 2023 17:05:00 -0700
Subject: [PATCH] ANDROID: kleaf: android/gki_system_dlkm_modules is generated.

modules.bzl is the source of truth for the list of GKI
modules. There is no need to keep two lists.

Test: TH
Bug: 287697703
Change-Id: I8953e92696833cf8ec27aa80724ec468c08736f1
Signed-off-by: Yifan Hong <elsk@google.com>
---
 BUILD.bazel                     | 10 ++++++
 android/gki_system_dlkm_modules | 61 ---------------------------------
 2 files changed, 10 insertions(+), 61 deletions(-)
 delete mode 100644 android/gki_system_dlkm_modules

diff --git a/BUILD.bazel b/BUILD.bazel
index cebec3d2207a..ea87355097b0 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2021 The Android Open Source Project
 
+load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
 load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c")
 load("//build/kernel/kleaf:kernel.bzl", "ddk_headers", "kernel_build", "kernel_images", "kernel_modules_install")
@@ -31,6 +32,15 @@ _GKI_X86_64_MAKE_GOALS = [
     "modules",
 ]
 
+write_file(
+    name = "gki_system_dlkm_modules",
+    out = "android/gki_system_dlkm_modules",
+    content = COMMON_GKI_MODULES_LIST + [
+        # Ensure new line at the end.
+        "",
+    ],
+)
+
 define_common_kernels(target_configs = {
     "kernel_aarch64": {
         "module_implicit_outs": COMMON_GKI_MODULES_LIST,
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
deleted file mode 100644
index f9275cff94ea..000000000000
--- a/android/gki_system_dlkm_modules
+++ /dev/null
@@ -1,61 +0,0 @@
-drivers/block/zram/zram.ko
-drivers/bluetooth/btbcm.ko
-drivers/bluetooth/btqca.ko
-drivers/bluetooth/btsdio.ko
-drivers/bluetooth/hci_uart.ko
-drivers/net/can/dev/can-dev.ko
-drivers/net/can/slcan/slcan.ko
-drivers/net/can/vcan.ko
-drivers/net/mii.ko
-drivers/net/ppp/bsd_comp.ko
-drivers/net/ppp/ppp_deflate.ko
-drivers/net/ppp/ppp_generic.ko
-drivers/net/ppp/ppp_mppe.ko
-drivers/net/ppp/pppox.ko
-drivers/net/ppp/pptp.ko
-drivers/net/slip/slhc.ko
-drivers/net/usb/aqc111.ko
-drivers/net/usb/asix.ko
-drivers/net/usb/ax88179_178a.ko
-drivers/net/usb/cdc_eem.ko
-drivers/net/usb/cdc_ether.ko
-drivers/net/usb/cdc_ncm.ko
-drivers/net/usb/r8152.ko
-drivers/net/usb/r8153_ecm.ko
-drivers/net/usb/rtl8150.ko
-drivers/net/usb/usbnet.ko
-drivers/usb/class/cdc-acm.ko
-drivers/usb/serial/ftdi_sio.ko
-drivers/usb/serial/usbserial.ko
-kernel/kheaders.ko
-lib/crypto/libarc4.ko
-mm/zsmalloc.ko
-net/6lowpan/6lowpan.ko
-net/6lowpan/nhc_dest.ko
-net/6lowpan/nhc_fragment.ko
-net/6lowpan/nhc_hop.ko
-net/6lowpan/nhc_ipv6.ko
-net/6lowpan/nhc_mobility.ko
-net/6lowpan/nhc_routing.ko
-net/6lowpan/nhc_udp.ko
-net/8021q/8021q.ko
-net/bluetooth/bluetooth.ko
-net/bluetooth/hidp/hidp.ko
-net/bluetooth/rfcomm/rfcomm.ko
-net/can/can.ko
-net/can/can-bcm.ko
-net/can/can-gw.ko
-net/can/can-raw.ko
-net/ieee802154/6lowpan/ieee802154_6lowpan.ko
-net/ieee802154/ieee802154.ko
-net/ieee802154/ieee802154_socket.ko
-net/l2tp/l2tp_core.ko
-net/l2tp/l2tp_ppp.ko
-net/mac80211/mac80211.ko
-net/mac802154/mac802154.ko
-net/nfc/nfc.ko
-net/rfkill/rfkill.ko
-net/tipc/diag.ko
-net/tipc/tipc.ko
-net/wireless/cfg80211.ko
-