Merge "Add symlink for system_dlkm modules" am: 7dac6abb9a am: e5a33f0723 am: 4aaac8ce5d

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

Change-Id: I18a00d834b850cc884c05a946d37690990680cc1
This commit is contained in:
Treehugger Robot 2021-12-21 01:45:10 +00:00 committed by Automerger Merge Worker
commit ab01212b4c

View file

@ -2728,6 +2728,19 @@ ifdef BOARD_USES_SYSTEM_EXTIMAGE
INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/system_ext,/system_ext,system_ext.img) INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/system_ext,/system_ext,system_ext.img)
endif endif
# -----------------------------------------------------------------
# system_dlkm partition image
# Create symlinks for system_dlkm on devices with a system_dlkm partition:
# /system/lib/modules -> /system_dlkm/lib/modules
#
# On devices with a system_dlkm partition,
# - /system/lib/modules is a symlink to a directory that stores system DLKMs.
# - The system_dlkm partition is mounted at /system_dlkm at runtime.
ifdef BOARD_USES_SYSTEM_DLKM_PARTITION
INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/lib/modules,/system_dlkm/lib/modules,system_dlkm.img)
endif
FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS) FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
# ASAN libraries in the system image - add dependency. # ASAN libraries in the system image - add dependency.