anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: kleaf: Explicit list of ABI files.

Browse Source 
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: Ib4c364e48a4aab945dbc37da5c13705e3e63f4d4
Signed-off-by: Yifan Hong <elsk@google.com>
This commit is contained in:
Yifan Hong
2022-09-15 11:39:50 -07:00
parent 41a23cd26e
commit a75431c61b
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
BUILD.bazel
View File

@@ -20,22 +20,49 @@ package(
load("//build/kernel/kleaf:constants.bzl", "aarch64_gz_outs")
load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c")
# 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_amlogic",
"android/abi_gki_aarch64_db845c",
"android/abi_gki_aarch64_exynos",
"android/abi_gki_aarch64_exynosauto",
"android/abi_gki_aarch64_fips140",
"android/abi_gki_aarch64_galaxy",
"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_pasa",
"android/abi_gki_aarch64_pixel",
"android/abi_gki_aarch64_qcom",
"android/abi_gki_aarch64_sunxi",
"android/abi_gki_aarch64_unisoc",
"android/abi_gki_aarch64_virtual_device",
"android/abi_gki_aarch64_virtual_device_removed",
"android/abi_gki_aarch64_vivo",
"android/abi_gki_aarch64_xiaomi",
]
define_common_kernels(target_configs = {
# Sync with build.config.gki.aarch64
"kernel_aarch64": {
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
],
"kmi_symbol_list": "android/abi_gki_aarch64",
"additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
"abi_definition": "android/abi_gki_aarch64.xml",
},
"kernel_aarch64_debug": {
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
],
"kmi_symbol_list": "android/abi_gki_aarch64",
"additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
"abi_definition": "android/abi_gki_aarch64.xml",
},
})

3
build.config.gki.aarch64
View File

@@ -7,9 +7,8 @@ Image.lz4
Image.gz
"
# Sync with BUILD.bazel
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