Merge "Revert "Add support for /system_dlkm partition for GKI modules.""
diff --git a/host/commands/assemble_cvd/disk_flags.cc b/host/commands/assemble_cvd/disk_flags.cc
index ac429ed..95ca27c 100644
--- a/host/commands/assemble_cvd/disk_flags.cc
+++ b/host/commands/assemble_cvd/disk_flags.cc
@@ -51,10 +51,6 @@
init_boot_image, "",
"Location of cuttlefish init boot image. If empty it is assumed to "
"be init_boot.img in the directory specified by -system_image_dir.");
-DEFINE_string(system_dlkm_image, "",
- "Location of cuttlefish GKI modules image. If empty it is "
- "assumed to be system_dlkm.img in the directory specified "
- "by -system_image_dir.");
DEFINE_string(data_image, "", "Location of the data partition image.");
DEFINE_string(super_image, "", "Location of the super partition image.");
DEFINE_string(misc_image, "",
@@ -115,11 +111,6 @@
SetCommandLineOptionWithMode("init_boot_image",
default_init_boot_image.c_str(),
google::FlagSettingMode::SET_FLAGS_DEFAULT);
- std::string default_system_dlkm_image =
- FLAGS_system_image_dir + "/system_dlkm.img";
- SetCommandLineOptionWithMode("system_dlkm_image",
- default_system_dlkm_image.c_str(),
- google::FlagSettingMode::SET_FLAGS_DEFAULT);
std::string default_data_image = FLAGS_system_image_dir + "/userdata.img";
SetCommandLineOptionWithMode("data_image", default_data_image.c_str(),
google::FlagSettingMode::SET_FLAGS_DEFAULT);
@@ -189,16 +180,6 @@
.read_only = true,
});
partitions.push_back(ImagePartition{
- .label = "system_dlkm_a",
- .image_file_path = FLAGS_system_dlkm_image,
- .read_only = true,
- });
- partitions.push_back(ImagePartition{
- .label = "system_dlkm_b",
- .image_file_path = FLAGS_system_dlkm_image,
- .read_only = true,
- });
- partitions.push_back(ImagePartition{
.label = "vendor_boot_a",
.image_file_path = FLAGS_vendor_boot_image,
.read_only = true,
@@ -464,11 +445,6 @@
LOG(WARNING) << "File not found: " << FLAGS_init_boot_image;
}
- if (!FileHasContent(FLAGS_system_dlkm_image)) {
- LOG(WARNING) << "File not found: " << FLAGS_system_dlkm_image;
- return false;
- }
-
if (!FileHasContent(FLAGS_vendor_boot_image)) {
LOG(ERROR) << "File not found: " << FLAGS_vendor_boot_image;
return false;
diff --git a/required_images b/required_images
index dfcfa5e..e6f0616 100644
--- a/required_images
+++ b/required_images
@@ -2,7 +2,6 @@
init_boot.img
bootloader
super.img
-system_dlkm.img
userdata.img
vbmeta.img
vbmeta_system.img
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 1e0ad60..c8802bb 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -38,10 +38,6 @@
BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE := 8388608
-# GKI Modules Partition /system_dlkm: 64MB
-BOARD_USES_SYSTEM_DLKM_PARTITION := true
-BOARD_SYSTEM_DLKM_PARTITION_SIZE := 67108864
-
# Build a separate vendor.img partition
BOARD_USES_VENDORIMAGE := true
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
diff --git a/shared/config/fstab.ext4 b/shared/config/fstab.ext4
index 8c4db74..2e1fa6c 100644
--- a/shared/config/fstab.ext4
+++ b/shared/config/fstab.ext4
@@ -4,7 +4,6 @@
/dev/block/by-name/vendor_boot /vendor_boot emmc defaults recoveryonly,slotselect
system /system erofs ro wait,logical,first_stage_mount,slotselect,avb=vbmeta_system,avb_keys=/avb
system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb=vbmeta_system,avb_keys=/avb
-/dev/block/by-name/system_dlkm /system_dlkm erofs ro defaults,slotselect
# Add all non-dynamic partitions except system, after this comment
/dev/block/by-name/userdata /data ext4 nodev,noatime,nosuid,errors=panic latemount,wait,check,quota,formattable,fileencryption=aes-256-xts:aes-256-cts,keydirectory=/metadata/vold/metadata_encryption,checkpoint=block
/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable,first_stage_mount,check
diff --git a/shared/config/fstab.f2fs b/shared/config/fstab.f2fs
index c8f3b4a1..e546335 100644
--- a/shared/config/fstab.f2fs
+++ b/shared/config/fstab.f2fs
@@ -4,7 +4,6 @@
/dev/block/by-name/vendor_boot /vendor_boot emmc defaults recoveryonly,slotselect
system /system erofs ro wait,logical,first_stage_mount,slotselect,avb=vbmeta_system,avb_keys=/avb
system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb=vbmeta_system,avb_keys=/avb
-/dev/block/by-name/system_dlkm /system_dlkm erofs ro defaults,slotselect
# Add all non-dynamic partitions except system, after this comment
/dev/block/by-name/userdata /data f2fs nodev,noatime,nosuid,inlinecrypt,reserve_root=32768 latemount,wait,check,quota,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,fscompress,keydirectory=/metadata/vold/metadata_encryption,checkpoint=fs
/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable,first_stage_mount,check
