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/build/Android.bp b/build/Android.bp
index 6ab1d89..59717b8 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -50,6 +50,9 @@
}) + select(release_flag("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"), {
true: ["paravirtualized_devices"],
default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"), {
+ true: ["tpu_assignable_device"],
+ default: [],
}),
}
@@ -64,6 +67,9 @@
}) + select(release_flag("RELEASE_AVF_ENABLE_VIRT_CPUFREQ"), {
true: ["-DAVF_ENABLE_VIRT_CPUFREQ=1"],
default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"), {
+ true: ["-DAVF_ENABLE_TPU_ASSIGNABLE_DEVICE=1"],
+ default: [],
}),
}