Multi_tenant is the new payload_not_root
Trying to have more fine-grained Rust configs than feature flags was
actually a terrible idea, and means extra work if I need to add
something that is multi-tenant related but not root related.
Use consistent naming throughout instead.
Bug: 302677468
Test: Builds
Change-Id: I2dfe97e8c62f24590522df89d9b373774a43d495
diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index 8456888..684aa64 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -34,7 +34,7 @@
IVirtualMachine::{BnVirtualMachine, IVirtualMachine},
IVirtualMachineCallback::IVirtualMachineCallback,
IVirtualizationService::IVirtualizationService,
- IVirtualizationService::FEATURE_PAYLOAD_NON_ROOT,
+ IVirtualizationService::FEATURE_MULTI_TENANT,
IVirtualizationService::FEATURE_VENDOR_MODULES,
IVirtualizationService::FEATURE_DICE_CHANGES,
MemoryTrimLevel::MemoryTrimLevel,
@@ -276,7 +276,7 @@
// TODO(b/298012279): make this scalable.
match feature {
FEATURE_DICE_CHANGES => Ok(cfg!(dice_changes)),
- FEATURE_PAYLOAD_NON_ROOT => Ok(cfg!(payload_not_root)),
+ FEATURE_MULTI_TENANT => Ok(cfg!(multi_tenant)),
FEATURE_VENDOR_MODULES => Ok(cfg!(vendor_modules)),
_ => {
warn!("unknown feature {feature}");