commit 534aa8a5b1a146aa600af208b3701ebb4c6a27f3
author Joel Galenson <jgalenson@google.com> Fri Jul 23 14:46:55 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 23 14:46:55 2021 +0000
tree 30424585a7ad934e6482da7605de6581ea68158a
parent 62d78030d5c02036fe4e5cfd77d09fd668de1dcf
parent 729a9a042680307e882b86d52e261ece080b6453

Merge "Migrate keystore2's Rust system library bindings to bionic."

authfs/src/file.rs

diff --git a/authfs/src/file.rs b/authfs/src/file.rs
index 033dbd6..44d5000 100644
--- a/authfs/src/file.rs
+++ b/authfs/src/file.rs
@@ -35,7 +35,7 @@
         new_spibinder(binder_rpc_unstable_bindgen::RpcClient(cid, RPC_SERVICE_PORT) as *mut AIBinder)
     };
     if let Some(ibinder) = ibinder {
-        Ok(IVirtFdService::try_from(ibinder).map_err(|e| {
+        Ok(<dyn IVirtFdService>::try_from(ibinder).map_err(|e| {
             io::Error::new(
                 io::ErrorKind::AddrNotAvailable,
                 format!("Cannot connect to RPC service: {}", e),

compos/src/pvm_exec.rs

diff --git a/compos/src/pvm_exec.rs b/compos/src/pvm_exec.rs
index 987a198..03fbf72 100644
--- a/compos/src/pvm_exec.rs
+++ b/compos/src/pvm_exec.rs
@@ -57,7 +57,7 @@
         new_spibinder(binder_rpc_unstable_bindgen::RpcClient(cid, VSOCK_PORT) as *mut AIBinder)
     };
     if let Some(ibinder) = ibinder {
-        ICompService::try_from(ibinder).context("Cannot connect to RPC service")
+        <dyn ICompService>::try_from(ibinder).context("Cannot connect to RPC service")
     } else {
         bail!("Invalid raw AIBinder")
     }

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 5fb5ab4..a5b2898 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -5,6 +5,7 @@
 microdroid_shell_and_utilities = [
     "reboot",
     "sh",
+    "strace",
     "toolbox",
     "toybox",
 ]

tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java

diff --git a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
index 4cb9dc0..988b1ad 100644
--- a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
+++ b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
@@ -273,7 +273,8 @@
             disconnected = ret.equals("failed to connect to " + MICRODROID_SERIAL);
             if (disconnected) {
                 // adb demands us to disconnect if the prior connection was a failure.
-                runOnHost("adb", "disconnect", MICRODROID_SERIAL);
+                // b/194375443: this somtimes fails, thus 'try*'.
+                tryRunOnHost("adb", "disconnect", MICRODROID_SERIAL);
             }
         }