commit 26ae72e2bfe33aba85805b5facc78acd58d81b0d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 22 03:00:37 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 22 03:00:37 2022 +0000
tree b19e41ac2f7425727240e81c0b195c32480124d0
parent e11eadee3159a1d1b282feb430ad08f6ce2766af
parent add7b7f78f8402d5f23f915a5e2c1b828ffc6300

Merge "Print apkdmverity/zipfuse output to MM's stdio"

microdroid_manager/src/main.rs

diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 0ac4167..ef8f5f5 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -440,8 +440,6 @@
 fn run_apkdmverity(args: &[ApkDmverityArgument]) -> Result<Child> {
     let mut cmd = Command::new(APKDMVERITY_BIN);
 
-    cmd.stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null());
-
     for argument in args {
         cmd.arg("--apk").arg(argument.apk).arg(argument.idsig).arg(argument.name);
         if let Some(root_hash) = argument.saved_root_hash {
@@ -473,15 +471,7 @@
     if let Some(property_name) = ready_prop {
         cmd.args(["-p", property_name]);
     }
-    cmd.arg("-o")
-        .arg(option)
-        .arg(zip_path)
-        .arg(mount_dir)
-        .stdin(Stdio::null())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .spawn()
-        .context("Spawn zipfuse")
+    cmd.arg("-o").arg(option).arg(zip_path).arg(mount_dir).spawn().context("Spawn zipfuse")
 }
 
 fn write_apex_payload_data(