Merge "Skip ramdump when running Microdroid with GKI as kernel" into main
diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index 2df4fd7..0055b3b 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -463,7 +463,7 @@
let debug_config = DebugConfig::new(config);
- let ramdump = if debug_config.is_ramdump_needed() {
+ let ramdump = if !uses_gki_kernel(config) && debug_config.is_ramdump_needed() {
Some(prepare_ramdump_file(&temporary_directory)?)
} else {
None
@@ -869,6 +869,16 @@
SUPPORTED_OS_NAMES.contains(os_name)
}
+fn uses_gki_kernel(config: &VirtualMachineConfig) -> bool {
+ if !cfg!(vendor_modules) {
+ return false;
+ }
+ match config {
+ VirtualMachineConfig::RawConfig(_) => false,
+ VirtualMachineConfig::AppConfig(config) => config.osName.starts_with("microdroid_gki-"),
+ }
+}
+
fn load_app_config(
config: &VirtualMachineAppConfig,
debug_config: &DebugConfig,