commit c3387225f20b964e727eca7717750444b7361641
author Jooyung Han <jooyung@google.com> Fri Apr 09 01:24:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 09 01:24:31 2021 +0000
tree b83e80ebbf402bcc435690ae3b51e677de3fae92
parent 98218200c461f3c6c0789431726c9731b23350a2
parent 25a2acc1023b6adf3e409bde75b8fc8c7a21154a

Merge "Use mk_cdisk instead of assemble_cvd"

authfs/TEST_MAPPING

diff --git a/authfs/TEST_MAPPING b/authfs/TEST_MAPPING
index d2dc1d8..d0c0b09 100644
--- a/authfs/TEST_MAPPING
+++ b/authfs/TEST_MAPPING
@@ -2,9 +2,6 @@
   "presubmit": [
     {
       "name": "authfs_device_test_src_lib"
-    },
-    {
-      "name": "AuthFsTestCases"
     }
   ]
 }

virtmanager/Android.bp

diff --git a/virtmanager/Android.bp b/virtmanager/Android.bp
index 1b2aec1..37c3bcc 100644
--- a/virtmanager/Android.bp
+++ b/virtmanager/Android.bp
@@ -7,6 +7,7 @@
     crate_name: "virtmanager",
     srcs: ["src/main.rs"],
     edition: "2018",
+    prefer_rlib: true,
     rustlibs: [
         "android.system.virtmanager-rust",
         "libandroid_logger",

vm/src/main.rs

diff --git a/vm/src/main.rs b/vm/src/main.rs
index 1f39e4a..6c1052f 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -24,7 +24,7 @@
 use std::fs::File;
 use std::io;
 use std::os::unix::io::{AsRawFd, FromRawFd};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use structopt::clap::AppSettings;
 use structopt::StructOpt;
 use sync::AtomicFlag;
@@ -73,7 +73,7 @@
 /// Run a VM from the given configuration file.
 fn command_run(
     virt_manager: Strong<dyn IVirtManager>,
-    config_path: &PathBuf,
+    config_path: &Path,
     daemonize: bool,
 ) -> Result<(), Error> {
     let config_filename = config_path.to_str().context("Failed to parse VM config path")?;