Merge "Increase timeout for microdroid commands"
diff --git a/microdroid/README.md b/microdroid/README.md
index c8ad8f4..febca39 100644
--- a/microdroid/README.md
+++ b/microdroid/README.md
@@ -53,10 +53,6 @@
{
"partitions": [
{
- "label": "misc",
- "path": "/data/local/tmp/microdroid/misc.img"
- },
- {
"label": "boot_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
@@ -131,7 +127,6 @@
```sh
$ adb root
$ adb shell 'mkdir /data/local/tmp/microdroid'
-$ adb shell 'dd if=/dev/zero of=/data/local/tmp/microdroid/misc.img bs=4k count=256'
$ adb push payload.json /data/local/tmp/microdroid/payload.json
$ adb shell 'cd /data/local/tmp/microdroid; /apex/com.android.virt/bin/mk_payload payload.json payload.img'
$ adb shell 'chmod go+r /data/local/tmp/microdroid/payload*'
diff --git a/microdroid/microdroid_cdisk.json b/microdroid/microdroid_cdisk.json
index e1ca826..5e3c9c5 100644
--- a/microdroid/microdroid_cdisk.json
+++ b/microdroid/microdroid_cdisk.json
@@ -1,10 +1,6 @@
{
"partitions": [
{
- "label": "misc",
- "path": "/data/local/tmp/virt/misc.img"
- },
- {
"label": "boot_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
diff --git a/microdroid/uboot-env-x86_64.txt b/microdroid/uboot-env-x86_64.txt
index ffc0462..dfa6a98 100644
--- a/microdroid/uboot-env-x86_64.txt
+++ b/microdroid/uboot-env-x86_64.txt
@@ -1,7 +1,7 @@
# Static u-boot environment variables for microdroid. See b/180481192
# Boot the device following the Android boot procedure
-bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0#misc
+bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0
bootdelay=0
diff --git a/microdroid/uboot-env.txt b/microdroid/uboot-env.txt
index 0bdc591..47b8f2c 100644
--- a/microdroid/uboot-env.txt
+++ b/microdroid/uboot-env.txt
@@ -1,7 +1,7 @@
# Static u-boot environment variables for microdroid. See b/180481192
# Boot the device following the Android boot procedure
-bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0#misc
+bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0
bootdelay=0
fdtaddr=0x80000000
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index 0a8a7d8..7f9b8de 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -150,14 +150,6 @@
return String.join(" ", Arrays.asList(strs));
}
- // TODO(b/191131043) remove this step
- private String createMiscImage() throws Exception {
- final String output = TEST_ROOT + "misc.img";
- runOnAndroid("dd", "if=/dev/zero", "of=" + output, "bs=4k", "count=256");
- assertThat(runOnAndroid("du", "-b", output), is(not("")));
- return output;
- }
-
private String createPayloadImage(String apkName, String packageName, String configPath)
throws Exception {
File apkFile = findTestFile(apkName);
@@ -223,9 +215,8 @@
private void startMicrodroid(String apkName, String packageName, String configPath)
throws Exception {
- // Create misc.img and payload.img
+ // Create payload.img
final String payloadImg = createPayloadImage(apkName, packageName, configPath);
- final String miscImg = createMiscImage();
// Tools and executables
final String mkCdisk = VIRT_APEX + "bin/mk_cdisk";