Remove shell invoking of payload
The payload will be automatically run by microdroid_manager.
Bug: 193118220
Test: atest MicrodroidHostTestCases
Change-Id: I851bc7890ebfc27dadea1fa9ce09413e18aed07c
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index a5b2898..5b183fc 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -35,6 +35,10 @@
target: "/system/etc",
name: "etc",
},
+ {
+ target: "/system/bin",
+ name: "bin",
+ },
]
android_system_image {
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index c05a841..8881c51 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -69,13 +69,8 @@
assertThat(runOnMicrodroid("getprop", "debug.microdroid.app.run"), is("true"));
assertThat(runOnMicrodroid("getprop", "debug.microdroid.app.sublib.run"), is("true"));
- // Manually execute the library and check the output
- final String microdroidLauncher = "system/bin/microdroid_launcher";
- assertThat(
- runOnMicrodroid(microdroidLauncher, testLib, "arg1", "arg2"),
- is("Hello Microdroid " + testLib + " arg1 arg2"));
-
- // Check that keystore was found by the payload
+ // Check that keystore was found by the payload. Wait until the property is set.
+ tryRunOnMicrodroid("watch -e \"getprop debug.microdroid.test.keystore | grep '^$'\"");
assertThat(runOnMicrodroid("getprop", "debug.microdroid.test.keystore"), is("PASS"));
shutdownMicrodroid(getDevice(), cid);