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);

android/virtmgr/src/dt_overlay.rs

diff --git a/android/virtmgr/src/dt_overlay.rs b/android/virtmgr/src/dt_overlay.rs
index d226635..108ed61 100644
--- a/android/virtmgr/src/dt_overlay.rs
+++ b/android/virtmgr/src/dt_overlay.rs
@@ -17,7 +17,7 @@
 use anyhow::{anyhow, Result};
 use cstr::cstr;
 use fsfdt::FsFdt;
-use libfdt::{Fdt, FdtError};
+use libfdt::Fdt;
 use std::ffi::CStr;
 use std::path::Path;
 
@@ -90,26 +90,7 @@
         fdt.overlay_onto(cstr!("/fragment@0/__overlay__"), path)?;
     }
 
-    if cfg!(tpu_assignable_device) {
-        let mut avf = fdt
-            .node_mut(cstr!("/fragment@0/__overlay__/avf"))
-            .map_err(|e| anyhow!("Failed to search avf node: {e:?}"))?
-            .ok_or(anyhow!("Failed to get avf node"))?;
-        let vendor_digest = cstr!("vendor_hashtree_descriptor_root_digest");
-        // Remove the vendor digest.
-        // In the case it is actually requested, it will be re-added by virtue of being in
-        // `trusted_props`.
-        match avf.delprop(vendor_digest) {
-            Ok(()) | Err(FdtError::NotFound) => {}
-            Err(e) => {
-                return Err(anyhow!("Unexpected error pre-removing {vendor_digest:?}: {e:?}"))
-            }
-        }
-        for (name, value) in trusted_props {
-            avf.setprop(name, value)
-                .map_err(|e| anyhow!("Failed to set trusted property: {e:?}"))?;
-        }
-    } else if !trusted_props.is_empty() {
+    if !trusted_props.is_empty() {
         let mut avf = fdt
             .node_mut(cstr!("/fragment@0/__overlay__/avf"))
             .map_err(|e| anyhow!("Failed to search avf node: {e:?}"))?