moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests 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: I8fbad63bf744672ba5b76b51cc908926d7b10849
Signed-off-by: Yifan Hong <elsk@google.com>
This commit is contained in:
Yifan Hong
2022-09-15 11:51:15 -07:00
committed by Treehugger Robot
parent c3154ba8a5
commit b8323be61d
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
BUILD.bazel
View File

@@ -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:common_kernels.bzl", "define_common_kernels", "define_db845c")
load("//build/kernel/kleaf:kernel.bzl", "kernel_build") load("//build/kernel/kleaf:kernel.bzl", "kernel_build")
# This uses android/abi_gki_aarch64* in kmi_configs. If the list of _aarch64_additional_kmi_symbol_lists = [
# glob(["android/abi_gki_aarch64*"]) differs from # keep sorted
# KMI_SYMBOL_LIST + ADDITIONAL_KMI_SYMBOL_LISTS in build.config.gki.aarch64, "android/abi_gki_aarch64_db845c",
# or TRIM_NONLISTED_KMI changes, override kmi_configs here. "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 = { define_common_kernels(target_configs = {
# Sync with build.config.gki.aarch64
"kernel_aarch64": { "kernel_aarch64": {
# TODO(b/188620248): re-enable trimming # TODO(b/188620248): re-enable trimming
"trim_nonlisted_kmi": False, "trim_nonlisted_kmi": False,
@@ -34,6 +48,8 @@ define_common_kernels(target_configs = {
"drivers/block/zram/zram.ko", "drivers/block/zram/zram.ko",
"mm/zsmalloc.ko", "mm/zsmalloc.ko",
], ],
"kmi_symbol_list": "android/abi_gki_aarch64",
"additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
}, },
"kernel_aarch64_debug": { "kernel_aarch64_debug": {
# TODO(b/188620248): re-enable trimming # TODO(b/188620248): re-enable trimming
@@ -43,6 +59,8 @@ define_common_kernels(target_configs = {
"drivers/block/zram/zram.ko", "drivers/block/zram/zram.ko",
"mm/zsmalloc.ko", "mm/zsmalloc.ko",
], ],
"kmi_symbol_list": "android/abi_gki_aarch64",
"additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
}, },
}) })

4
build.config.gki.aarch64
View File

@@ -7,11 +7,9 @@ Image.lz4
Image.gz Image.gz
" "
# Sync with BUILD.bazel
# uncomment ABI_DEFINITION when enabling KMI enforcement # uncomment ABI_DEFINITION when enabling KMI enforcement
#ABI_DEFINITION=android/abi_gki_aarch64.xml #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 KMI_SYMBOL_LIST=android/abi_gki_aarch64
ADDITIONAL_KMI_SYMBOL_LISTS=" ADDITIONAL_KMI_SYMBOL_LISTS="
android/abi_gki_aarch64_virtual_device android/abi_gki_aarch64_virtual_device