Make extra APKs easier to specify
Allow extra APKs to be specified in VirtualMachineAppConfig as an
alternative to the config file, so the paths don't need to be fixed.
This involves adding:
- the extra_apk_count to the metadata proto, which is persisted in the
instance image.
- the extra APK fds to VirtualMachinePayloadConfig, so it can be
included in VirtualMachineAppConfig iff there is no config file.
And then a whole lot of plumbing to make it all work.
Using this requires the USE_CUSTOM_VIRTUAL_MACHINE permission, and is
behind the multi-tenant feature flag.
I've not attempted to add API yet (this CL is already big), but I have
extended the vm command to allow it to be exercised.
Bug: 303201498
Test: Start a VM with an extra APK specified on the `vm run-app`
command line.
Change-Id: Ib5da40a33960fd9639b62e8d77e865aeb1f6398b
diff --git a/virtualizationmanager/src/payload.rs b/virtualizationmanager/src/payload.rs
index c19c103..05626d3 100644
--- a/virtualizationmanager/src/payload.rs
+++ b/virtualizationmanager/src/payload.rs
@@ -194,7 +194,8 @@
let payload_metadata = match &app_config.payload {
Payload::PayloadConfig(payload_config) => PayloadMetadata::Config(PayloadConfig {
payload_binary_name: payload_config.payloadBinaryName.clone(),
- ..Default::default()
+ extra_apk_count: payload_config.extraApks.len().try_into()?,
+ special_fields: Default::default(),
}),
Payload::ConfigPath(config_path) => {
PayloadMetadata::ConfigPath(format!("/mnt/apk/{}", config_path))
@@ -258,10 +259,11 @@
debug_config: &DebugConfig,
apk_file: File,
idsig_file: File,
+ extra_apk_files: Vec<File>,
vm_payload_config: &VmPayloadConfig,
temporary_directory: &Path,
) -> Result<DiskImage> {
- if vm_payload_config.extra_apks.len() != app_config.extraIdsigs.len() {
+ if extra_apk_files.len() != app_config.extraIdsigs.len() {
bail!(
"payload config has {} apks, but app config has {} idsigs",
vm_payload_config.extra_apks.len(),
@@ -309,26 +311,23 @@
});
// we've already checked that extra_apks and extraIdsigs are in the same size.
- let extra_apks = &vm_payload_config.extra_apks;
let extra_idsigs = &app_config.extraIdsigs;
- for (i, (extra_apk, extra_idsig)) in extra_apks.iter().zip(extra_idsigs.iter()).enumerate() {
+ for (i, (extra_apk_file, extra_idsig)) in
+ extra_apk_files.into_iter().zip(extra_idsigs.iter()).enumerate()
+ {
partitions.push(Partition {
- label: format!("extra-apk-{}", i),
- image: Some(ParcelFileDescriptor::new(
- File::open(PathBuf::from(&extra_apk.path)).with_context(|| {
- format!("Failed to open the extra apk #{} {}", i, extra_apk.path)
- })?,
- )),
+ label: format!("extra-apk-{i}"),
+ image: Some(ParcelFileDescriptor::new(extra_apk_file)),
writable: false,
});
partitions.push(Partition {
- label: format!("extra-idsig-{}", i),
+ label: format!("extra-idsig-{i}"),
image: Some(ParcelFileDescriptor::new(
extra_idsig
.as_ref()
.try_clone()
- .with_context(|| format!("Failed to clone the extra idsig #{}", i))?,
+ .with_context(|| format!("Failed to clone the extra idsig #{i}"))?,
)),
writable: false,
});
@@ -459,12 +458,14 @@
Ok(())
}
+#[allow(clippy::too_many_arguments)] // TODO: Fewer arguments
pub fn add_microdroid_payload_images(
config: &VirtualMachineAppConfig,
debug_config: &DebugConfig,
temporary_directory: &Path,
apk_file: File,
idsig_file: File,
+ extra_apk_files: Vec<File>,
vm_payload_config: &VmPayloadConfig,
vm_config: &mut VirtualMachineRawConfig,
) -> Result<()> {
@@ -473,6 +474,7 @@
debug_config,
apk_file,
idsig_file,
+ extra_apk_files,
vm_payload_config,
temporary_directory,
)?);