commit 543c58b347a5adf193be2e94e7cb393a3b53670c
author Ram Muthiah <rammuthiah@google.com> Mon Mar 15 17:40:40 2021 -0700
committer Ram Muthiah <rammuthiah@google.com> Mon Mar 15 20:53:17 2021 -0700
tree 4ea09f0a30e4ef4b82cf0fedc8d3c3e854a80ec7
parent af5f756ee9845040eee38b3570de8a624fa3c165

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

diff --git a/microdroid/README.md b/microdroid/README.md
index fe0843f..465d234 100644
--- a/microdroid/README.md
+++ b/microdroid/README.md
@@ -52,7 +52,7 @@
 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'
 ```
 

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 7a45a8c..092a1dd 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -84,7 +84,7 @@
         // 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";