Support vendor partition in non-debuggable pVMs
Remove the "vendor_hashtree_descriptor_root_digest" prop from the avf
node by default. It will be re-added by virtue of being a trusted prop
in the case that the caller requested the vendor partition.
Stop adding the kerel param "androidboot.microdroid.mount_vendor=1" if
the vendorImage is supplied, as the kernel param is replaced by the
mechanism described above.
Bug: 340506965
Test: TH
Change-Id: I2994526c205ac3830efe0fb060b1ba16c747f14a
diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 87fb611..9d985ad 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -1105,7 +1105,9 @@
if let Some(file) = custom_config.vendorImage.as_ref() {
add_microdroid_vendor_image(clone_file(file)?, &mut vm_config);
- append_kernel_param("androidboot.microdroid.mount_vendor=1", &mut vm_config)
+ if !cfg!(tpu_assignable_device) {
+ append_kernel_param("androidboot.microdroid.mount_vendor=1", &mut vm_config);
+ }
}
vm_config.devices.clone_from(&custom_config.devices);