commit d4bc533ff01d360b1725725dd590c17d58b61c55
author Jooyung Han <jooyung@google.com> Wed Mar 24 16:48:56 2021 +0900
committer Jooyung Han <jooyung@google.com> Wed Mar 24 17:19:32 2021 +0900
tree 94453c77bfbc7993b70366ebe10793f41ccc6660
parent 4dc85c9ebcb1ddf8b286044bb16c345c9ab2fdd8

Rename composite.img to os_composite.img

assemble_cvd changed it recently.

Test: MicrodroidTestCase
Bug: n/a
Change-Id: I67ff25071ce20f9df445707e43a17d67bf5850cf

microdroid/README.md

diff --git a/microdroid/README.md b/microdroid/README.md
index 363d623..d737e22 100644
--- a/microdroid/README.md
+++ b/microdroid/README.md
@@ -55,7 +55,7 @@
 
 ```
 $ adb shell 'HOME=/data/local/tmp; PATH=$PATH:/apex/com.android.virt/bin; assemble_cvd -protected_vm < /dev/null'
-$ adb shell 'cd /data/local/tmp; /apex/com.android.virt/bin/crosvm run --cid=5 --disable-sandbox --bios=bootloader --serial=type=stdout --disk=cuttlefish_runtime/composite.img'
+$ adb shell 'cd /data/local/tmp; /apex/com.android.virt/bin/crosvm run --cid=5 --disable-sandbox --bios=bootloader --serial=type=stdout --disk=cuttlefish_runtime/os_composite.img'
 ```
 
 The CID in `--cid` parameter can be anything greater than 2 (`VMADDR_CID_HOST`).

tests/hostside/java/android/virt/test/MicrodroidTestCase.java

diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index 32b3c11..c5c86a6 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -81,13 +81,13 @@
         getDevice().executeShellCommand("mkdir -p " + TEST_ROOT + "etc/cvd_config");
         getDevice().pushString("{}", TEST_ROOT + "etc/cvd_config/cvd_config_phone.json");
 
-        // Run assemble_cvd to create composite.img
+        // Run assemble_cvd to create os_composite.img
         getDevice().executeShellCommand("HOME=" + TEST_ROOT + "; "
                 + "PATH=$PATH:" + VIRT_APEX + "bin; "
                 + VIRT_APEX + "bin/assemble_cvd -protected_vm < /dev/null");
 
-        // Make sure that composite.img is created
-        final String compositeImg = TEST_ROOT + "cuttlefish_runtime/composite.img";
+        // Make sure that os_composite.img is created
+        final String compositeImg = TEST_ROOT + "cuttlefish_runtime/os_composite.img";
         CommandResult result = getDevice().executeShellV2Command("du -b " + compositeImg);
         assertThat(result.getExitCode(), is(0));
         assertThat(result.getStdout(), is(not("")));
@@ -102,7 +102,7 @@
                         + "--disable-sandbox "
                         + "--bios=bootloader "
                         + "--serial=type=syslog "
-                        + "--disk=cuttlefish_runtime/composite.img");
+                        + "--disk=cuttlefish_runtime/os_composite.img");
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }