commit faabfbd487db9fa79ddba6f49b02011b3b54b571
author Pechetty Sravani (xWF) <pechetty@google.com> Tue Sep 24 15:27:48 2024 +0000
committer Matt Gilbride <mattgilbride@google.com> Tue Sep 24 18:32:12 2024 +0000
tree 018d7a803fbfaac8143087b8ea25d0ea6e2f2ebc
parent ef4c6ec763e7586b6b5e69c57147e908935712d1

Revert "Support vendor partition in non-debuggable pVMs"

Revert submission 3236797-b/340506965

Reason for revert: DroidMonitor created revert due to b/366178299.

Reverted changes: /q/submissionid:3236797-b/340506965

Tracking bug: b/369390218

Change-Id: Iedbc8212f46235a47789265f6f235ed49fd5ea99

android/virtmgr/src/aidl.rs

diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 9d985ad..87fb611 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -1105,9 +1105,7 @@
 
         if let Some(file) = custom_config.vendorImage.as_ref() {
             add_microdroid_vendor_image(clone_file(file)?, &mut vm_config);
-            if !cfg!(tpu_assignable_device) {
-                append_kernel_param("androidboot.microdroid.mount_vendor=1", &mut vm_config);
-            }
+            append_kernel_param("androidboot.microdroid.mount_vendor=1", &mut vm_config)
         }
 
         vm_config.devices.clone_from(&custom_config.devices);