From 7beed73af0664057745502e2af1b48edcc4ef834 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Thu, 27 Jul 2023 17:57:09 +0000 Subject: [PATCH] ANDROID: GKI: Create symbol files in include/config Create input symbol files to generate GKI modules header under include/config. By placing files in this generated directory, the default filters that ignore certain files will work without any special handling required, and they will also be available to inspect after the build to inspect for the debugging purposes. abi_gki_protected_exports: Input for gki_module_protected_exports.h From :- ${objtree}/abi_gki_protected_exports To :- include/config/abi_gki_protected_exports all_kmi_symbols: Input for gki_module_unprotected.h - Rename to abi_gki_kmi_symbols From :- all_kmi_symbols To :- include/config/abi_gki_kmi_symbols Bug: 286529877 Test: TH Test: Manual verification of the generated files Change-Id: Iafa10631e7712a8e1e87a2f56cfd614de6b1053a Signed-off-by: Ramji Jiyani --- kernel/module/Makefile | 2 +- scripts/gen_gki_modules_headers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 458cb6e44e85..5d9035643b9a 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -28,7 +28,7 @@ obj-$(CONFIG_MODULE_UNLOAD_TAINT_TRACKING) += tracking.o $(obj)/gki_module.o: include/generated/gki_module_protected_exports.h \ include/generated/gki_module_unprotected.h -ALL_KMI_SYMBOLS := all_kmi_symbols +ALL_KMI_SYMBOLS := include/config/abi_gki_kmi_symbols include/generated/gki_module_unprotected.h: $(ALL_KMI_SYMBOLS) \ $(srctree)/scripts/gen_gki_modules_headers.sh diff --git a/scripts/gen_gki_modules_headers.sh b/scripts/gen_gki_modules_headers.sh index 3aa221a058f4..ca435f49b62f 100755 --- a/scripts/gen_gki_modules_headers.sh +++ b/scripts/gen_gki_modules_headers.sh @@ -108,7 +108,7 @@ if [ "$(basename "${TARGET}")" = "gki_module_unprotected.h" ]; then generate_header "${TARGET}" "${GKI_VENDOR_SYMBOLS}" "unprotected" else # Sorted list of exported symbols - GKI_EXPORTED_SYMBOLS="${objtree}/abi_gki_protected_exports" + GKI_EXPORTED_SYMBOLS="include/config/abi_gki_protected_exports" if [ -z "${SYMBOL_LIST}" ]; then # Create empty list if ARCH doesn't have protected exports