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/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(