tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: simplify ABI file matching

Browse Source 
This commit introduces the Makefile variable AARCH to abstract away the
difference between Linux and GKI architecture names.

Bug: 393044622
Bug: 372188974
Change-Id: I345510055ccce7f849ab86f90f3457ac57226efa
Signed-off-by: Giuliano Procida <gprocida@google.com>
This commit is contained in:
Giuliano Procida
2024-10-07 13:12:29 +01:00
committed by Ulises Mendez Martinez
parent 4b13e18775
commit 1dfd260fc2
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/module/Makefile
+5 -7
View File
@@ -40,17 +40,15 @@ include/generated/gki_module_unprotected.h: $(ALL_KMI_SYMBOLS) \
"$(srctree)" \ "$(srctree)" \
$(ALL_KMI_SYMBOLS) $(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 arm64; empty for others # Generate symbol list with union of all symbol list for arm64; empty for others
$(ALL_KMI_SYMBOLS): $(if $(filter arm64,$(ARCH)),$(wildcard $(srctree)/android/abi_gki_aarch64_*),) $(ALL_KMI_SYMBOLS): $(if $(filter arm64,$(ARCH)),$(wildcard $(srctree)/android/abi_gki_$(AARCH)_*),)
$(if $(strip $^),cat $^ > $(ALL_KMI_SYMBOLS), echo "" > $(ALL_KMI_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 list file specific to ARCH if exists else empty
ABI_PROTECTED_EXPORTS_FILE := ABI_PROTECTED_EXPORTS_FILE := $(wildcard $(srctree)/android/abi_gki_protected_exports_$(AARCH))
ifeq ($(ARCH),arm64)
ABI_PROTECTED_EXPORTS_FILE := $(wildcard $(srctree)/android/abi_gki_protected_exports_aarch64)
else
ABI_PROTECTED_EXPORTS_FILE := $(wildcard $(srctree)/android/abi_gki_protected_exports_$(ARCH))
endif
include/generated/gki_module_protected_exports.h: $(ABI_PROTECTED_EXPORTS_FILE) \ include/generated/gki_module_protected_exports.h: $(ABI_PROTECTED_EXPORTS_FILE) \
$(srctree)/scripts/gen_gki_modules_headers.sh $(srctree)/scripts/gen_gki_modules_headers.sh