From d28f45772fe9ce2bf16013fa19c53de0e1021cac Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Tue, 26 Mar 2024 18:04:21 +0000 Subject: [PATCH] Remove check that only allows microdroid vendor partition on debuggable VMs The microdroid vendor partition is now verified during Microdroid boot, so no need for this check. Bug: 287593065 Test: AVF presubmit Change-Id: I84811f818ef1140f1fe93d9da5f9ee61341e75dd --- init/first_stage_init.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp index 356aaa091..bfe636bbf 100644 --- a/init/first_stage_init.cpp +++ b/init/first_stage_init.cpp @@ -408,18 +408,6 @@ int FirstStageMain(int argc, char** argv) { LOG(INFO) << "init first stage started!"; - // We only allow /vendor partition in debuggable Microdrod until it is verified during boot. - // TODO(b/285855436): remove this check. - if (IsMicrodroid()) { - bool mount_vendor = - cmdline.find("androidboot.microdroid.mount_vendor=1") != std::string::npos; - bool debuggable = - bootconfig.find("androidboot.microdroid.debuggable = \"1\"") != std::string::npos; - if (mount_vendor && !debuggable) { - LOG(FATAL) << "Attempted to mount /vendor partition for non-debuggable Microdroid VM"; - } - } - auto old_root_dir = std::unique_ptr{opendir("/"), closedir}; if (!old_root_dir) { PLOG(ERROR) << "Could not opendir(\"/\"), not freeing ramdisk";