commit a5ead030a968a58354dce1c080a8125da18a49b7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 03 15:03:45 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 03 15:03:45 2024 +0000
tree 410e7d6b31c08eec1223474ee1f3f68b4dd18e81
parent 31602f2db9b9ec114be70c5f8150b5b8625d5620
parent a3c285885a7ad28dbc7552984071869018bcc538

Merge "MicrodroidConfig: Unify API across flag configs" into main am: a3c285885a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3253222

Change-Id: I6c4bc648f3d6a7bee683cd1e3e1a27a7615fe6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/vm/src/main.rs

diff --git a/android/vm/src/main.rs b/android/vm/src/main.rs
index 6eee201..f2c2fa4 100644
--- a/android/vm/src/main.rs
+++ b/android/vm/src/main.rs
@@ -159,12 +159,12 @@
 
 impl MicrodroidConfig {
     #[cfg(vendor_modules)]
-    fn vendor(&self) -> &Option<PathBuf> {
-        &self.vendor
+    fn vendor(&self) -> Option<&PathBuf> {
+        self.vendor.as_ref()
     }
 
     #[cfg(not(vendor_modules))]
-    fn vendor(&self) -> Option<PathBuf> {
+    fn vendor(&self) -> Option<&PathBuf> {
         None
     }
 
@@ -179,13 +179,13 @@
     }
 
     #[cfg(device_assignment)]
-    fn devices(&self) -> &Vec<PathBuf> {
+    fn devices(&self) -> &[PathBuf] {
         &self.devices
     }
 
     #[cfg(not(device_assignment))]
-    fn devices(&self) -> Vec<PathBuf> {
-        Vec::new()
+    fn devices(&self) -> &[PathBuf] {
+        &[]
     }
 }