commit 4657d0e048b18c0693a62dac6df3354ba0c7653b
author Inseob Kim <inseob@google.com> Thu Nov 28 13:34:10 2024 +0900
committer Inseob Kim <inseob@google.com> Thu Nov 28 14:52:42 2024 +0900
tree bbd61077b3c63444fdd6a685e7a9daebea3a60a9
parent cb079c4c61de3be6728e38b6e4f884de3d01e79a

Reapply "Add os parameter to composd_cmd"

This reverts commit 17e555be3285bc9dedccb0876dfd892a4dfe0ea5.

Reason for revert: fixed composd by adding os correctly

Bug: 302465542
Test: atest odsign_e2e_tests
Change-Id: I31bcd068594890e532429bf41828de850a0f2a0a

android/composd/src/instance_manager.rs

diff --git a/android/composd/src/instance_manager.rs b/android/composd/src/instance_manager.rs
index 9e94035..d1b0b99 100644
--- a/android/composd/src/instance_manager.rs
+++ b/android/composd/src/instance_manager.rs
@@ -46,11 +46,12 @@
         self.start_instance(CURRENT_INSTANCE_DIR, vm_parameters)
     }
 
-    pub fn start_test_instance(&self, prefer_staged: bool) -> Result<CompOsInstance> {
+    pub fn start_test_instance(&self, prefer_staged: bool, os: &str) -> Result<CompOsInstance> {
         let mut vm_parameters = new_vm_parameters()?;
         vm_parameters.name = String::from("ComposdTest");
         vm_parameters.debug_mode = true;
         vm_parameters.prefer_staged = prefer_staged;
+        vm_parameters.os = os.to_owned();
         self.start_instance(TEST_INSTANCE_DIR, vm_parameters)
     }
 
@@ -83,7 +84,8 @@
     // number of dex2oat threads.
     let cpu_topology = VmCpuTopology::MatchHost;
     let memory_mib = Some(compos_memory_mib()?);
-    Ok(VmParameters { cpu_topology, memory_mib, ..Default::default() })
+    let os = "microdroid".to_owned();
+    Ok(VmParameters { cpu_topology, memory_mib, os, ..Default::default() })
 }
 
 fn compos_memory_mib() -> Result<i32> {