commit 8d08181221a9f5bf83cb95ffb6717a1f45b8edc3
author Jiyong Park <jiyong@google.com> Fri Jul 23 17:45:04 2021 +0900
committer Jiyong Park <jiyong@google.com> Tue Jul 27 20:17:15 2021 +0900
tree 85227e69b2df99ed3b7d87c9b1137014b8ece669
parent 9ae4b5cfb756052ed3bcc68f7484327e896a4ad1

instance.img is actually added as a writable partition

Bootloader doesn't use the partition yet.

Bug: 193504400
Test: atest MicrodroidHostTestCases
Change-Id: I7138d966630ebf79c9b7cbc2ea7343852460e2ec

virtualizationservice/src/aidl.rs

diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 1d99c2d..e3579da 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -362,8 +362,7 @@
 ) -> Result<VirtualMachineRawConfig> {
     let apk_file = clone_file(config.apk.as_ref().unwrap())?;
     let idsig_file = clone_file(config.idsig.as_ref().unwrap())?;
-    // TODO(b/193504400) pass this to crosvm
-    let _instance_file = clone_file(config.instanceImage.as_ref().unwrap())?;
+    let instance_file = clone_file(config.instanceImage.as_ref().unwrap())?;
     let config_path = &config.configPath;
 
     let mut apk_zip = ZipArchive::new(&apk_file)?;
@@ -391,6 +390,7 @@
             temporary_directory,
             apk_file,
             idsig_file,
+            instance_file,
             apexes,
             &mut vm_config,
         )?;