shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues 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: I3cd494dee47b68a0fe7c3c80dd379b5af6b060fe
Signed-off-by: Yifan Hong <elsk@google.com>
This commit is contained in:
Yifan Hong
2022-09-15 11:39:30 -07:00
committed by Treehugger Robot
parent d25aa0dbae
commit 7b87b9ddb4
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
BUILD.bazel
View File

@@ -19,8 +19,26 @@ package(
load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels") load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels")
# 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_core",
# or TRIM_NONLISTED_KMI changes, override kmi_configs here. "android/abi_gki_aarch64_db845c",
define_common_kernels() "android/abi_gki_aarch64_fips140",
"android/abi_gki_aarch64_generic",
"android/abi_gki_aarch64_hikey960",
"android/abi_gki_aarch64_virtual_device",
]
define_common_kernels(target_configs = {
# Sync with build.config.gki.aarch64
"kernel_aarch64": {
"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": {
"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 Image.gz
" "
# Sync with BUILD.bazel
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_core android/abi_gki_aarch64_core