ANDROID: Revert^2 "Set ALL_KMI_SYMBOLS to CONFIG_UNUSED_KSYMS_WHITELIST."
This reverts commit 386a5a9207.
Reason for revert: fix issue by adding back AARCH variable.
Bug: 406094444
Change-Id: I07c96726b1e9a0d89974cd85dcbc331b090b72da
Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user