commit 4dda2fb53ee669c711d19d3f60de9570f56ad245
author Inseob Kim <inseob@google.com> Fri Nov 15 18:24:42 2024 +0900
committer Inseob Kim <inseob@google.com> Fri Nov 15 18:25:26 2024 +0900
tree e491609754a6cb58d5e13e540793664568d4158f
parent 08501d8dbe6582c2c74589603423828eb50e2fb0

Add os parameter to composd_cmd

This will be used by AVFHostTestCases and ComposTestCases to test
various microdroid OSes.

Bug: 302465542
Test: composd_cmd
Change-Id: I85b86fa66f0c79b633eb359873b94edcff79d561

android/composd/src/service.rs

diff --git a/android/composd/src/service.rs b/android/composd/src/service.rs
index 49cfd3a..3cc40af 100644
--- a/android/composd/src/service.rs
+++ b/android/composd/src/service.rs
@@ -60,6 +60,7 @@
         &self,
         apex_source: ApexSource,
         callback: &Strong<dyn ICompilationTaskCallback>,
+        os: &str,
     ) -> binder::Result<Strong<dyn ICompilationTask>> {
         check_permissions()?;
         let prefer_staged = match apex_source {
@@ -67,7 +68,7 @@
             ApexSource::PreferStaged => true,
             _ => unreachable!("Invalid ApexSource {:?}", apex_source),
         };
-        to_binder_result(self.do_start_test_compile(prefer_staged, callback))
+        to_binder_result(self.do_start_test_compile(prefer_staged, callback, os))
     }
 }
 
@@ -93,9 +94,12 @@
         &self,
         prefer_staged: bool,
         callback: &Strong<dyn ICompilationTaskCallback>,
+        os: &str,
     ) -> Result<Strong<dyn ICompilationTask>> {
-        let comp_os =
-            self.instance_manager.start_test_instance(prefer_staged).context("Starting CompOS")?;
+        let comp_os = self
+            .instance_manager
+            .start_test_instance(prefer_staged, os)
+            .context("Starting CompOS")?;
 
         let target_dir_name = TEST_ARTIFACTS_SUBDIR.to_owned();
         let task = OdrefreshTask::start(