Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c31b049 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Support system_dlkm in GSI 

From Android 13, all devices must include a system_dlkm partition.
The patch enables system_dlkm on all GSI targets to support the devices
with system_dlkm partition, and be compatible with old devices
without a system_dlkm partition.

With patch, there is no /system/system_dlkm, and add a symlink
/system/lib/modules -> /system_dlkm/lib/modules

Bug: 256984997
Test: make gsi_arm64-user and aosp_arm64-user; check system folder
Change-Id: I2453ec43d584423cc4d5f0e23405f0ae9b6c5c90
parent 542672d7

target/board/BoardConfigGsiCommon.mk

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(GSI_FILE_SYSTEM_TYPE) 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

TARGET_USERIMAGES_SPARSE_EROFS_DISABLED := true



# Enable system_dlkm image for creating a symlink in GSI to support

# the devices with system_dlkm partition

BOARD_USES_SYSTEM_DLKMIMAGE := true

BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4

TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm



# GSI also includes make_f2fs to support userdata parition in f2fs

# for some devices

TARGET_USERIMAGES_USE_F2FS := true

target/product/gsi_release.mk

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ PRODUCT_BUILD_USERDATA_IMAGE := false 
PRODUCT_BUILD_VENDOR_IMAGE := false

PRODUCT_BUILD_SUPER_PARTITION := false

PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false

PRODUCT_BUILD_SYSTEM_DLKM_IMAGE := false

PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true



# Always build modules from source