StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip stripping 16K GKI kernel modules" into main am: c187d5052b am: f40afd580c am: 67628ae37e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2779729

Change-Id: I48919f4d9940ff2aa20159bd9084dc6985076261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-12 20:21:27 +00:00
committed by Automerger Merge Worker
parent 95cd8fb9a6 67628ae37e
commit 04530c919e
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/Makefile
View File

@@ -1060,9 +1060,16 @@ TARGET_OUT_RAMDISK_16K := $(PRODUCT_OUT)/ramdisk_16k
BUILT_RAMDISK_16K_TARGET := $(PRODUCT_OUT)/ramdisk_16k.img
RAMDISK_16K_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_ramdisk_16k)
ifneq ($(BOARD_SYSTEM_KERNEL_MODULES),)
SYSTEM_DLKM_MODULE_PATTERNS := $(foreach path,$(BOARD_SYSTEM_KERNEL_MODULES),%/$(notdir $(path)))
endif
# For non-GKI modules, strip them before install. As debug symbols take up
# significant space.
$(foreach \
file,\
$(BOARD_KERNEL_MODULES_16K),\
$(filter-out $(SYSTEM_DLKM_MODULE_PATTERNS),$(BOARD_KERNEL_MODULES_16K)),\
$(eval \
$(call copy-and-strip-kernel-module,\
$(file),\
@@ -1071,6 +1078,20 @@ $(foreach \
) \
)
# For GKI modules, copy as-is without stripping, because stripping would
# remove the signature of kernel modules, and GKI modules must be signed
# for kernel to load them.
$(foreach \
file,\
$(filter $(SYSTEM_DLKM_MODULE_PATTERNS),$(BOARD_KERNEL_MODULES_16K)),\
$(eval \
$(call copy-one-file,\
$(file),\
$(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0/$(notdir $(file)) \
) \
) \
)
BOARD_VENDOR_RAMDISK_FRAGMENT.16K.PREBUILT := $(BUILT_RAMDISK_16K_TARGET)
$(BUILT_RAMDISK_16K_TARGET): $(DEPMOD) $(MKBOOTFS) $(EXTRACT_KERNEL) $(COMPRESSION_COMMAND_DEPS)