pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename composite.img to os_composite.img 

assemble_cvd changed it recently.

Test: MicrodroidTestCase
Bug: n/a
Change-Id: I67ff25071ce20f9df445707e43a17d67bf5850cf
This commit is contained in:
Jooyung Han 2021-03-24 16:48:56 +09:00
parent 4dc85c9ebc
commit d4bc533ff0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microdroid/README.md
View File

@ -55,7 +55,7 @@ future, this shall be done via [`virtmanager`](../virtmanager/).
``` ```
$ adb shell 'HOME=/data/local/tmp; PATH=$PATH:/apex/com.android.virt/bin; assemble_cvd -protected_vm < /dev/null' $ 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`). The CID in `--cid` parameter can be anything greater than 2 (`VMADDR_CID_HOST`).

8
tests/hostside/java/android/virt/test/MicrodroidTestCase.java
View File

@ -81,13 +81,13 @@ public class MicrodroidTestCase extends BaseHostJUnit4Test {
getDevice().executeShellCommand("mkdir -p " + TEST_ROOT + "etc/cvd_config"); getDevice().executeShellCommand("mkdir -p " + TEST_ROOT + "etc/cvd_config");
getDevice().pushString("{}", TEST_ROOT + "etc/cvd_config/cvd_config_phone.json"); 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 + "; " getDevice().executeShellCommand("HOME=" + TEST_ROOT + "; "
+ "PATH=$PATH:" + VIRT_APEX + "bin; " + "PATH=$PATH:" + VIRT_APEX + "bin; "
+ VIRT_APEX + "bin/assemble_cvd -protected_vm < /dev/null"); + VIRT_APEX + "bin/assemble_cvd -protected_vm < /dev/null");
// Make sure that composite.img is created // Make sure that os_composite.img is created
final String compositeImg = TEST_ROOT + "cuttlefish_runtime/composite.img"; final String compositeImg = TEST_ROOT + "cuttlefish_runtime/os_composite.img";
CommandResult result = getDevice().executeShellV2Command("du -b " + compositeImg); CommandResult result = getDevice().executeShellV2Command("du -b " + compositeImg);
assertThat(result.getExitCode(), is(0)); assertThat(result.getExitCode(), is(0));
assertThat(result.getStdout(), is(not(""))); assertThat(result.getStdout(), is(not("")));
@ -102,7 +102,7 @@ public class MicrodroidTestCase extends BaseHostJUnit4Test {
+ "--disable-sandbox " + "--disable-sandbox "
+ "--bios=bootloader " + "--bios=bootloader "
+ "--serial=type=syslog " + "--serial=type=syslog "
+ "--disk=cuttlefish_runtime/composite.img"); + "--disk=cuttlefish_runtime/os_composite.img");
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }