diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-01 23:01:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-01 23:01:57 +0000 |
| commit | 87b537146e02b158459019794b1a503cd3476069 (patch) | |
| tree | 7eb822a128a20b2f9153666a6b2cac0552c2c8a8 | |
| parent | 7501cb2a618675438ee04463ee4f3e3856765ea4 (diff) | |
| parent | 1382fe78e08941eb5fde03624a2d44a2da9784dd (diff) | |
| download | gs201-87b537146e02b158459019794b1a503cd3476069.tar.gz | |
Snap for 10243005 from 1382fe78e08941eb5fde03624a2d44a2da9784dd to udc-d1-release
Change-Id: I8048fde4c7b714055481c6294327255a417ab696
| -rw-r--r-- | BoardConfig-common.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 92dab88..f680441 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -411,7 +411,15 @@ BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/ven ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD $(error vendor_dlkm.modules.load not found or empty) endif + +# staging kernels might have modules split between system/vendor_dlkm. If +# the target defined modules on the system_dlkm image, honor the split. +# Otherwise, assume all modules are stored on the vendor_dlkm image. +ifneq ($(BOARD_SYSTEM_KERNEL_MODULES),) +BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_MODULES_LOAD))) +else BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES) +endif # Using BUILD_COPY_HEADERS BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true |