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_cmd/composd_cmd.rs

diff --git a/android/composd_cmd/composd_cmd.rs b/android/composd_cmd/composd_cmd.rs
index 6d096a1..6281bd0 100644
--- a/android/composd_cmd/composd_cmd.rs
+++ b/android/composd_cmd/composd_cmd.rs
@@ -46,6 +46,10 @@
         /// If any APEX is staged, prefer the staged version.
         #[clap(long)]
         prefer_staged: bool,
+
+        /// OS for the VM.
+        #[clap(long, default_value = "microdroid")]
+        os: String,
     },
 }
 
@@ -56,7 +60,7 @@
 
     match action {
         Actions::StagedApexCompile {} => run_staged_apex_compile()?,
-        Actions::TestCompile { prefer_staged } => run_test_compile(prefer_staged)?,
+        Actions::TestCompile { prefer_staged, os } => run_test_compile(prefer_staged, &os)?,
     }
 
     println!("All Ok!");
@@ -116,9 +120,9 @@
     run_async_compilation(|service, callback| service.startStagedApexCompile(callback))
 }
 
-fn run_test_compile(prefer_staged: bool) -> Result<()> {
+fn run_test_compile(prefer_staged: bool, os: &str) -> Result<()> {
     let apex_source = if prefer_staged { ApexSource::PreferStaged } else { ApexSource::NoStaged };
-    run_async_compilation(|service, callback| service.startTestCompile(apex_source, callback))
+    run_async_compilation(|service, callback| service.startTestCompile(apex_source, callback, os))
 }
 
 fn run_async_compilation<F>(start_compile_fn: F) -> Result<()>