diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-11-08 01:15:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-11-08 01:15:59 +0000 |
| commit | be013898a2fbcc1e11c9f3c1c51cb7ec01c513df (patch) | |
| tree | 4b9608187e1bf7bc639ee168aa23cc060dbe6f0c | |
| parent | 52cb0349f15082579aa3f1d3be024795b4ebe06d (diff) | |
| parent | b9f0f50b670b179f59f26bab610ce4dcdd8aaca7 (diff) | |
| download | build-be013898a2fbcc1e11c9f3c1c51cb7ec01c513df.tar.gz | |
Merge "Support system_dlkm in GSI" into android13-gsi
| -rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 6 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 53714a8594..89305b40ad 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -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 diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 74501cd1f1..9587d975c4 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -78,6 +78,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 |