Merge "De-duplicate kernel module names" into main am: a997e48000

Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I91b8b475fc874ca3fd7e64072458effcd071a693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-26 19:35:01 +00:00
committed by Automerger Merge Worker

View File

@@ -1065,6 +1065,18 @@ SYSTEM_DLKM_MODULE_PATTERNS := $(foreach path,$(BOARD_SYSTEM_KERNEL_MODULES),%/$
endif
# BOARD_KERNEL_MODULES_16K might contain duplicate modules under different path.
# for example, foo/bar/wifi.ko and foo/wifi.ko . To avoid build issues, de-dup
# module list on basename first.
BOARD_KERNEL_MODULES_16K := $(foreach \
pattern,\
$(sort $(foreach \
path,\
$(BOARD_KERNEL_MODULES_16K),\
%/$(notdir $(path)))\
),\
$(firstword $(filter $(pattern),$(BOARD_KERNEL_MODULES_16K))) \
)
# For non-GKI modules, strip them before install. As debug symbols take up
# significant space.
$(foreach \