From c785c4c1eccd55b6962fe97824e2cf9aa2a52767 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 8 Apr 2025 11:14:44 -0700 Subject: [PATCH] ANDROID: Revert^2 "Set ALL_KMI_SYMBOLS to CONFIG_UNUSED_KSYMS_WHITELIST." This reverts commit 386a5a92077ea2d5df3d466b9df0633b734e44ed. Reason for revert: fix issue by adding back AARCH variable. Bug: 406094444 Change-Id: I07c96726b1e9a0d89974cd85dcbc331b090b72da Signed-off-by: HONG Yifan --- kernel/module/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 3c0db7f101f6..bbe67f8c6940 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -32,7 +32,13 @@ obj-$(CONFIG_MODULE_STATS) += stats.o $(obj)/gki_module.o: include/generated/gki_module_protected_exports.h \ include/generated/gki_module_unprotected.h +ifneq ($(CONFIG_UNUSED_KSYMS_WHITELIST),) +ALL_KMI_SYMBOLS := $(CONFIG_UNUSED_KSYMS_WHITELIST) +else ALL_KMI_SYMBOLS := include/config/abi_gki_kmi_symbols +$(ALL_KMI_SYMBOLS): + : > $@ +endif include/generated/gki_module_unprotected.h: $(ALL_KMI_SYMBOLS) \ $(srctree)/scripts/gen_gki_modules_headers.sh @@ -43,10 +49,6 @@ include/generated/gki_module_unprotected.h: $(ALL_KMI_SYMBOLS) \ # AARCH is the same as ARCH, except that arm64 becomes aarch64 AARCH := $(if $(filter arm64,$(ARCH)),aarch64,$(ARCH)) -# Generate symbol list with union of all symbol list for ARCH -$(ALL_KMI_SYMBOLS): $(wildcard $(srctree)/gki/$(AARCH)/symbols/*) - $(if $(strip $^),cat $^ > $(ALL_KMI_SYMBOLS), echo "" > $(ALL_KMI_SYMBOLS)) - # ABI protected exports list file specific to ARCH if exists else empty ABI_PROTECTED_EXPORTS_FILE := $(wildcard $(srctree)/gki/$(AARCH)/protected_exports)