commit d1601b50e65d54b5ee2cf26a357bcee233b758f3
author Yifan Hong <elsk@google.com> Fri Jun 16 17:05:00 2023 -0700
committer Yifan Hong <elsk@google.com> Thu Jun 22 00:48:30 2023 +0000
tree fcc7a939e4815a1df258505e5d9847aa9754b132
parent a7068670a71db7ca244054c4b24a86b160da1515

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
Signed-off-by: Yifan Hong <elsk@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:a8a61755f67730af45d50f6173a4eedbcefa1c87)
Merged-In: I8953e92696833cf8ec27aa80724ec468c08736f1
Change-Id: I8953e92696833cf8ec27aa80724ec468c08736f1

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 23b3001..2c49af5 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,5 +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(
@@ -31,6 +33,15 @@
     "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.
+        "",
+    ],
+)
+
 filegroup(
     name = "aarch64_additional_kmi_symbol_lists",
     srcs = [

android/gki_system_dlkm_modules

diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
deleted file mode 100644
index 733138ffd..0000000
--- a/android/gki_system_dlkm_modules
+++ /dev/null
@@ -1,59 +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.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/mac802154/mac802154.ko
-net/nfc/nfc.ko
-net/rfkill/rfkill.ko
-net/tipc/diag.ko
-net/tipc/tipc.ko
-