From b8323be61da942f797e9bdaf959b13d68426a57f Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 15 Sep 2022 11:51:15 -0700
Subject: [PATCH] ANDROID: kleaf: Explicit list of ABI files.

In BUILD.bazel, explicitly list abi_definition,
kmi_symbol_list, and additional_kmi_symbol_lists.
This avoids using the glob expression which may
accidentally match editor backup files.

Bug: 246344503
Test: TH
Change-Id: I8fbad63bf744672ba5b76b51cc908926d7b10849
Signed-off-by: Yifan Hong <elsk@google.com>
---
 BUILD.bazel              | 26 ++++++++++++++++++++++----
 build.config.gki.aarch64 |  4 +---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 0ecc69b64c88..c5932d174f75 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -21,11 +21,25 @@ 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", "kernel_build")
 
-# This uses android/abi_gki_aarch64* in kmi_configs. If the list of
-# glob(["android/abi_gki_aarch64*"]) differs from
-# KMI_SYMBOL_LIST + ADDITIONAL_KMI_SYMBOL_LISTS in build.config.gki.aarch64,
-# or TRIM_NONLISTED_KMI changes, override kmi_configs here.
+_aarch64_additional_kmi_symbol_lists = [
+    # keep sorted
+    "android/abi_gki_aarch64_db845c",
+    "android/abi_gki_aarch64_exynos",
+    "android/abi_gki_aarch64_exynosauto",
+    "android/abi_gki_aarch64_fips140",
+    "android/abi_gki_aarch64_honor",
+    "android/abi_gki_aarch64_imx",
+    "android/abi_gki_aarch64_mtk",
+    "android/abi_gki_aarch64_mtktv",
+    "android/abi_gki_aarch64_oplus",
+    "android/abi_gki_aarch64_pixel",
+    "android/abi_gki_aarch64_qcom",
+    "android/abi_gki_aarch64_unisoc",
+    "android/abi_gki_aarch64_virtual_device",
+]
+
 define_common_kernels(target_configs = {
+    # Sync with build.config.gki.aarch64
     "kernel_aarch64": {
         # TODO(b/188620248): re-enable trimming
         "trim_nonlisted_kmi": False,
@@ -34,6 +48,8 @@ define_common_kernels(target_configs = {
             "drivers/block/zram/zram.ko",
             "mm/zsmalloc.ko",
         ],
+        "kmi_symbol_list": "android/abi_gki_aarch64",
+        "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
     },
     "kernel_aarch64_debug": {
         # TODO(b/188620248): re-enable trimming
@@ -43,6 +59,8 @@ define_common_kernels(target_configs = {
             "drivers/block/zram/zram.ko",
             "mm/zsmalloc.ko",
         ],
+        "kmi_symbol_list": "android/abi_gki_aarch64",
+        "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
     },
 })
 
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 70f9b2644469..d236ebf0d69e 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -7,11 +7,9 @@ Image.lz4
 Image.gz
 "
 
+# Sync with BUILD.bazel
 # uncomment ABI_DEFINITION when enabling KMI enforcement
 #ABI_DEFINITION=android/abi_gki_aarch64.xml
-
-# Update BUILD.bazel, define_common_kernels() if the list differs from
-# android/abi_gki_aarch64* in the filesystem.
 KMI_SYMBOL_LIST=android/abi_gki_aarch64
 ADDITIONAL_KMI_SYMBOL_LISTS="
 android/abi_gki_aarch64_virtual_device