From dcd8844837617f0b4e0835e7ce346e20d3ab94fe 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 6faced191d6d..6af2195f5002 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -19,53 +19,31 @@ package(
 
 load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c")
 
+_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": {
-        "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_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": {
-        "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": {
         "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,
     },
 })