From 543c58b347a5adf193be2e94e7cb393a3b53670c Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Mon, 15 Mar 2021 17:40:40 -0700 Subject: [PATCH] Update microdroid test to include protected_vm flag assemble_cvd was updated to include a flag which would disable insecure launcher options. Bug: 182005319 Test: local boot on cuttlefish Change-Id: I3aabd594bf742a7639d4f57a1276a2733545c03e --- microdroid/README.md | 2 +- tests/hostside/java/android/virt/test/MicrodroidTestCase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/microdroid/README.md b/microdroid/README.md index fe0843f1..465d2347 100644 --- a/microdroid/README.md +++ b/microdroid/README.md @@ -52,7 +52,7 @@ Create the composite image using `assemble_cvd` and run it via `crosvm`. In the future, this shall be done via [`virtmanager`](../virtmanager/). ``` -$ adb shell 'HOME=/data/local/tmp; PATH=$PATH:/apex/com.android.virt/bin; assemble_cvd < /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' ``` diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java index 7a45a8c1..092a1dd8 100644 --- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java +++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java @@ -84,7 +84,7 @@ public class MicrodroidTestCase extends BaseHostJUnit4Test { // Run assemble_cvd to create composite.img getDevice().executeShellCommand("HOME=" + TEST_ROOT + "; " + "PATH=$PATH:" + VIRT_APEX + "bin; " - + VIRT_APEX + "bin/assemble_cvd < /dev/null"); + + 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";