From 9bb8b084648ee2dbdcc0f8c6866aeab597c40eed Mon Sep 17 00:00:00 2001
From: Ramji Jiyani <ramjiyani@google.com>
Date: Tue, 1 Nov 2022 19:47:55 +0000
Subject: [PATCH] ANDROID: GKI: BUILD.bazel: Clean up modules list

Create a generic global list for GKI modules' list
and use that instead of cluttering the long list in
every target to keep it more robust and readable.

Bug: 232431151
Test: TH
Change-Id: Ib7f7be7988204c483519be0b38a90007d54b7912
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
---
 BUILD.bazel | 48 +++++++++++++-----------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 97d09763553d..4c73fad5cb08 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -28,63 +28,41 @@ _aarch64_additional_kmi_symbol_lists = [
     "android/abi_gki_aarch64_pixel",
 ]
 
+_common_gki_modules_list = [
+    # keep sorted
+    "drivers/block/zram/zram.ko",
+    "mm/zsmalloc.ko",
+    "net/mac80211/mac80211.ko",
+    "net/wireless/cfg80211.ko",
+]
+
 define_common_kernels(target_configs = {
     "kernel_aarch64": {
         # TODO(b/188620248): re-enable trimming
         "trim_nonlisted_kmi": False,
         "kmi_symbol_list_strict_mode": False,
-        "module_implicit_outs": [
-            # keep sorted
-            "drivers/block/zram/zram.ko",
-            "mm/zsmalloc.ko",
-            "net/mac80211/mac80211.ko",
-            "net/wireless/cfg80211.ko",
-        ],
+        "module_implicit_outs": _common_gki_modules_list,
         "kmi_symbol_list": "android/abi_gki_aarch64",
         "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
     },
     "kernel_aarch64_16k": {
-        "module_implicit_outs": [
-            # keep sorted
-            "drivers/block/zram/zram.ko",
-            "mm/zsmalloc.ko",
-            "net/mac80211/mac80211.ko",
-            "net/wireless/cfg80211.ko",
-        ],
+        "module_implicit_outs": _common_gki_modules_list,
     },
     "kernel_aarch64_debug": {
         # TODO(b/188620248): re-enable trimming
         "trim_nonlisted_kmi": False,
         "kmi_symbol_list_strict_mode": False,
-        "module_implicit_outs": [
-            # keep sorted
-            "drivers/block/zram/zram.ko",
-            "mm/zsmalloc.ko",
-            "net/mac80211/mac80211.ko",
-            "net/wireless/cfg80211.ko",
-        ],
+        "module_implicit_outs": _common_gki_modules_list,
         "kmi_symbol_list": "android/abi_gki_aarch64",
         "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
     },
     "kernel_x86_64": {
         "kmi_symbol_list_strict_mode": False,
-        "module_implicit_outs": [
-            # keep sorted
-            "drivers/block/zram/zram.ko",
-            "mm/zsmalloc.ko",
-            "net/mac80211/mac80211.ko",
-            "net/wireless/cfg80211.ko",
-        ],
+        "module_implicit_outs": _common_gki_modules_list,
     },
     "kernel_x86_64_debug": {
         "kmi_symbol_list_strict_mode": False,
-        "module_implicit_outs": [
-            # keep sorted
-            "drivers/block/zram/zram.ko",
-            "mm/zsmalloc.ko",
-            "net/mac80211/mac80211.ko",
-            "net/wireless/cfg80211.ko",
-        ],
+        "module_implicit_outs": _common_gki_modules_list,
     },
 })