Remove microdroid_payload.json
The file was the input to make the payload.img. Instead using the
hard-coded file, let the test make it from the vm_config file in the
test APK. This will eventually be done by the client-side library, but
since we don't have it, let the test do it.
Bug: 185891097
Test: atest MicrodroidHostTestCases
Change-Id: I677dff58abb1b49d76b53c39ec33ccc0c8b88dc4
diff --git a/apex/Android.bp b/apex/Android.bp
index 53c77db..5b6f0a9 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -55,7 +55,6 @@
"com.android.virt.init.rc",
"microdroid_cdisk.json",
"microdroid_cdisk_env.json",
- "microdroid_payload.json",
"microdroid_uboot_env",
"microdroid_bootloader",
],
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index b454ea2..6f731bb 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -398,11 +398,6 @@
}
prebuilt_etc {
- name: "microdroid_payload.json",
- src: "microdroid_payload.json",
-}
-
-prebuilt_etc {
name: "microdroid_vendor_manifest",
src: "microdroid_vendor_manifest.xml",
filename: "manifest.xml",
diff --git a/microdroid/README.md b/microdroid/README.md
index 6b9f4b1..c2a65d5 100644
--- a/microdroid/README.md
+++ b/microdroid/README.md
@@ -42,9 +42,11 @@
## Running
-Create a config file, `microdroid.json`:
+Create two config files, `microdroid.json` and `payload.json`:
```json
+microdroid.json:
+
{
"bootloader": "/apex/com.android.virt/etc/microdroid_bootloader",
"disks": [
@@ -108,9 +110,20 @@
}
]
}
+
+payload.json:
+
+{
+ "system_apexes" : [
+ "com.android.adbd",
+ "com.android.i18n",
+ "com.android.os.statsd",
+ "com.android.sdkext"
+ ],
+}
```
-Copy the artifacts to the temp directory, create the composite image using
+Copy the these files to the temp directory, create the composite image using
`mk_cdisk` and copy the VM config file. For now, some other files have to be
manually created. In the future, you won't need these, and this shall be done
via [`virtualizationservice`](../virtualizationservice/).
@@ -119,7 +132,8 @@
$ 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 shell 'cd /data/local/tmp/microdroid; /apex/com.android.virt/bin/mk_payload /apex/com.android.virt/etc/microdroid_payload.json payload.img'
+$ 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*'
$ adb push microdroid.json /data/local/tmp/microdroid/microdroid.json
```
diff --git a/microdroid/microdroid_payload.json b/microdroid/microdroid_payload.json
deleted file mode 100644
index 83766de..0000000
--- a/microdroid/microdroid_payload.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "system_apexes": [
- "com.android.adbd",
- "com.android.i18n",
- "com.android.os.statsd",
- "com.android.sdkext"
- ],
- "apk": {
- "name": "com.android.microdroid.test",
- "path": "APK_PATH"
- },
- "payload_config_path": "/mnt/apk/assets/vm_config.json"
-}
diff --git a/microdroid/sepolicy/system/private/microdroid_launcher.te b/microdroid/sepolicy/system/private/microdroid_launcher.te
index e68b687..5a313b6 100644
--- a/microdroid/sepolicy/system/private/microdroid_launcher.te
+++ b/microdroid/sepolicy/system/private/microdroid_launcher.te
@@ -21,3 +21,6 @@
# Allow to use terminal
allow microdroid_launcher devpts:chr_file rw_file_perms;
+
+# Allow to set debug prop
+set_prop(microdroid_launcher, debug_prop)
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index ded8b76..87a9822 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -30,16 +30,26 @@
import com.android.tradefed.util.CommandStatus;
import com.android.tradefed.util.RunUtil;
+import org.json.JSONArray;
+import org.json.JSONObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.zip.ZipFile;
@RunWith(DeviceJUnit4ClassRunner.class)
public class MicrodroidTestCase extends BaseHostJUnit4Test {
@@ -55,7 +65,10 @@
@Test
public void testMicrodroidBoots() throws Exception {
- startMicrodroid("MicrodroidTestApp.apk", "com.android.microdroid.test");
+ final String apkName = "MicrodroidTestApp.apk";
+ final String packageName = "com.android.microdroid.test";
+ final String configPath = "assets/vm_config.json"; // path inside the APK
+ startMicrodroid(apkName, packageName, configPath);
waitForMicrodroidBoot(MICRODROID_BOOT_TIMEOUT_MINUTES);
adbConnectToMicrodroid();
@@ -81,7 +94,11 @@
final String label = "u:object_r:system_file:s0";
assertThat(runOnMicrodroid("ls", "-Z", testLib), is(label + " " + testLib));
- // Execute the library and check the result
+ // Check if the command in vm_config.json was executed by examining the side effect of the
+ // command
+ assertThat(runOnMicrodroid("getprop", "debug.microdroid.app.run"), is("true"));
+
+ // Manually execute the library and check the output
final String microdroidLauncher = "system/bin/microdroid_launcher";
assertThat(
runOnMicrodroid(microdroidLauncher, testLib, "arg1", "arg2"),
@@ -133,59 +150,99 @@
return String.join(" ", Arrays.asList(strs));
}
- private void startMicrodroid(String apkFile, String packageName) throws Exception {
- // Tools and executables
- final String mkCdisk = VIRT_APEX + "bin/mk_cdisk";
- final String mkPayload = VIRT_APEX + "bin/mk_payload";
- final String crosvm = VIRT_APEX + "bin/crosvm";
+ // 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;
+ }
- // Input files
- final String cdiskJson = VIRT_APEX + "etc/microdroid_cdisk.json";
- final String cdiskEnvJson = VIRT_APEX + "etc/microdroid_cdisk_env.json";
- final String payloadJsonOrig = VIRT_APEX + "etc/microdroid_payload.json";
- final String bootloader = VIRT_APEX + "etc/microdroid_bootloader";
+ private String createPayloadImage(String apkName, String packageName, String configPath)
+ throws Exception {
+ File apkFile = findTestFile(apkName);
+ getDevice().installPackage(apkFile, /* reinstall */ true);
- // Generated files
- final String payloadJson = TEST_ROOT + "payload.json";
- final String testApkIdsig = TEST_ROOT + apkFile + ".idsig";
-
- // Image files created
- final String miscImg = TEST_ROOT + "misc.img";
- final String osImg = TEST_ROOT + "os_composite.img";
- final String envImg = TEST_ROOT + "env_composite.img";
- final String payloadImg = TEST_ROOT + "payload.img";
-
- // Create misc.img
- // TODO(jiyong) remove this step
- runOnAndroid("dd", "if=/dev/zero", "of=" + miscImg, "bs=4k", "count=256");
-
- // Create os_composite.img, env_composite.img
- runOnAndroid(mkCdisk, cdiskJson, osImg);
- runOnAndroid(mkCdisk, cdiskEnvJson, envImg);
-
- // Push the idsig file to the device
- // TODO(b/190343842): pass this file to mk_payload
- File idsigOnHost =
- (new CompatibilityBuildHelper(getBuild())).getTestFile(apkFile + ".idsig");
- getDevice().pushFile(idsigOnHost, testApkIdsig);
-
- // Create payload.img from microdroid_payload.json. APK_PATH marker in the file is
- // replaced with the actual path to the test APK.
+ // Read the config file from the apk and parse it to know the list of APEXes needed
+ ZipFile apkAsZip = new ZipFile(apkFile);
+ InputStream is = apkAsZip.getInputStream(apkAsZip.getEntry(configPath));
+ String configString =
+ new BufferedReader(new InputStreamReader(is))
+ .lines()
+ .collect(Collectors.joining("\n"));
+ JSONObject configObject = new JSONObject(configString);
+ JSONArray apexes = configObject.getJSONArray("apexes");
+ List<String> apexNames = new ArrayList<>();
+ for (int i = 0; i < apexes.length(); i++) {
+ JSONObject anApex = apexes.getJSONObject(i);
+ apexNames.add(anApex.getString("name"));
+ }
// Get the path to the installed apk. Note that
// getDevice().getAppPackageInfo(...).getCodePath() doesn't work due to the incorrect
// parsing of the "=" character. (b/190975227). So we use the `pm path` command directly.
- String testApk = runOnAndroid("pm", "path", packageName);
- assertTrue(testApk.startsWith("package:"));
- testApk = testApk.substring("package:".length());
- testApk = testApk.replace("/", "\\\\/"); // escape slash
- runOnAndroid("sed", "s/APK_PATH/" + testApk + "/", payloadJsonOrig, ">", payloadJson);
- runOnAndroid(mkPayload, payloadJson, payloadImg);
+ String apkPath = runOnAndroid("pm", "path", packageName);
+ assertTrue(apkPath.startsWith("package:"));
+ apkPath = apkPath.substring("package:".length());
- // Make sure that the images are actually created
- assertThat(runOnAndroid("du", "-b", osImg, envImg, payloadImg), is(not("")));
+ // Create payload.json from the gathered data
+ JSONObject payloadObject = new JSONObject();
+ payloadObject.put("system_apexes", new JSONArray(apexNames));
+ payloadObject.put("payload_config_path", "/mnt/apk/" + configPath);
+ JSONObject apkObject = new JSONObject();
+ apkObject.put("path", apkPath);
+ apkObject.put("name", packageName);
+ payloadObject.put("apk", apkObject);
+
+ // Push the idsig file to the device
+ // TODO(b/190343842): pass path to this file to payloadObject
+ // File idsigOnHost = findTestFile(apkFile + ".idsig");
+ // final String testApkIdsig = TEST_ROOT + apkFile + ".idsig";
+ // getDevice().pushFile(idsigOnHost, testApkIdsig);
+
+ // Copy the json file to Android
+ File payloadJsonOnHost = File.createTempFile("payload", "json");
+ FileWriter writer = new FileWriter(payloadJsonOnHost);
+ writer.write(payloadObject.toString());
+ writer.close();
+ final String payloadJson = TEST_ROOT + "payload.json";
+ getDevice().pushFile(payloadJsonOnHost, payloadJson);
+
+ // Finally run mk_payload to create payload.img
+ final String mkPayload = VIRT_APEX + "bin/mk_payload";
+ final String payloadImg = TEST_ROOT + "payload.img";
+ runOnAndroid(mkPayload, payloadJson, payloadImg);
+ assertThat(runOnAndroid("du", "-b", payloadImg), is(not("")));
+
+ return payloadImg;
+ }
+
+ private File findTestFile(String name) throws Exception {
+ return (new CompatibilityBuildHelper(getBuild())).getTestFile(name);
+ }
+
+ private void startMicrodroid(String apkName, String packageName, String configPath)
+ throws Exception {
+ // Create misc.img and payload.img
+ final String payloadImg = createPayloadImage(apkName, packageName, configPath);
+ final String miscImg = createMiscImage();
+
+ // Tools and executables
+ final String mkCdisk = VIRT_APEX + "bin/mk_cdisk";
+ final String crosvm = VIRT_APEX + "bin/crosvm";
+
+ // Create os_composisite.img and env_composite.img
+ // TODO(jiyong): remove this when running a VM is done by `vm`
+ final String cdiskJson = VIRT_APEX + "etc/microdroid_cdisk.json";
+ final String cdiskEnvJson = VIRT_APEX + "etc/microdroid_cdisk_env.json";
+ final String osImg = TEST_ROOT + "os_composite.img";
+ final String envImg = TEST_ROOT + "env_composite.img";
+ final String bootloader = VIRT_APEX + "etc/microdroid_bootloader";
+ runOnAndroid(mkCdisk, cdiskJson, osImg);
+ runOnAndroid(mkCdisk, cdiskEnvJson, envImg);
// Start microdroid using crosvm
+ // TODO(jiyong): do this via the `vm` command
ExecutorService executor = Executors.newFixedThreadPool(1);
executor.execute(
() -> {
diff --git a/tests/testapk/assets/vm_config.json b/tests/testapk/assets/vm_config.json
index 7a3df7a..8312f4d 100644
--- a/tests/testapk/assets/vm_config.json
+++ b/tests/testapk/assets/vm_config.json
@@ -9,5 +9,19 @@
"hello",
"microdroid"
]
- }
-}
\ No newline at end of file
+ },
+ "apexes": [
+ {
+ "name": "com.android.adbd"
+ },
+ {
+ "name": "com.android.i18n"
+ },
+ {
+ "name": "com.android.os.statsd"
+ },
+ {
+ "name": "com.android.sdkext"
+ }
+ ]
+}
diff --git a/tests/testapk/src/native/testbinary.cpp b/tests/testapk/src/native/testbinary.cpp
index c317cd2..c3eefc4 100644
--- a/tests/testapk/src/native/testbinary.cpp
+++ b/tests/testapk/src/native/testbinary.cpp
@@ -14,6 +14,7 @@
* limitations under the License.
*/
#include <stdio.h>
+#include <sys/system_properties.h>
extern "C" int android_native_main(int argc, char* argv[]) {
printf("Hello Microdroid ");
@@ -25,5 +26,7 @@
}
}
printf("\n");
+
+ __system_property_set("debug.microdroid.app.run", "true");
return 0;
}