Merge changes I7db582ac,Ie68b88c4
* changes:
Sign MicrdroidTestApp using APK sig scheme V4
Move test apk out of the virt apex
diff --git a/apex/Android.bp b/apex/Android.bp
index 3db4c1a..53c77db 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -51,11 +51,6 @@
"mk_cdisk",
"mk_payload",
],
- apps: [
- // TODO(jiyong): remove this when microdroid_payload.json is created by
- // VirtualizationService.
- "MicrodroidTestApp",
- ],
prebuilts: [
"com.android.virt.init.rc",
"microdroid_cdisk.json",
diff --git a/microdroid/microdroid_payload.json b/microdroid/microdroid_payload.json
index 7af0452..83766de 100644
--- a/microdroid/microdroid_payload.json
+++ b/microdroid/microdroid_payload.json
@@ -7,7 +7,7 @@
],
"apk": {
"name": "com.android.microdroid.test",
- "path": "/apex/com.android.virt/app/MicrodroidTestApp/MicrodroidTestApp.apk"
+ "path": "APK_PATH"
},
"payload_config_path": "/mnt/apk/assets/vm_config.json"
}
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index 429b737..8edd65d 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -6,5 +6,9 @@
name: "MicrodroidHostTestCases",
srcs: ["java/**/*.java"],
test_suites: ["device-tests"],
- libs: ["tradefed"],
+ libs: [
+ "tradefed",
+ "compatibility-tradefed",
+ ],
+ data: [":MicrodroidTestApp.signed"],
}
diff --git a/tests/hostside/AndroidTest.xml b/tests/hostside/AndroidTest.xml
index da24b71..247923d 100644
--- a/tests/hostside/AndroidTest.xml
+++ b/tests/hostside/AndroidTest.xml
@@ -18,6 +18,11 @@
<option name="force-root" value="true" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="MicrodroidTestApp.apk" />
+ </target_preparer>
+
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="MicrodroidHostTestCases.jar" />
</test>
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index a1043f7..baa383b 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -20,8 +20,10 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeThat;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.util.CommandResult;
@@ -50,6 +52,7 @@
private static final int TEST_VM_CID = 10;
private static final int TEST_VM_ADB_PORT = 8000;
private static final String MICRODROID_SERIAL = "localhost:" + TEST_VM_ADB_PORT;
+ private static final String TEST_APK = "MicrodroidTestApp.apk";
// This is really slow on GCE (2m 40s) but fast on localhost or actual Android phones (< 10s)
// Set the maximum timeout value big enough.
private static final long MICRODROID_BOOT_TIMEOUT_MINUTES = 5;
@@ -93,10 +96,33 @@
"cd %s; %sbin/mk_cdisk %setc/microdroid_cdisk_env.json env_composite.img",
TEST_ROOT, VIRT_APEX, VIRT_APEX);
getDevice().executeShellCommand(makeEnvCompositeCmd);
+
+ String idsigPath = TEST_ROOT + TEST_APK + ".idsig";
+ File idsigFile = (new CompatibilityBuildHelper(getBuild())).getTestFile(TEST_APK + ".idsig");
+ getDevice().pushFile(idsigFile, idsigPath);
+
+ // TODO(b/190343842): pass this file to mk_payload
+ String idsigExists = getDevice().executeShellV2Command("[ -f " + idsigPath + " ] && echo ok")
+ .getStdout().trim();
+ assertThat(idsigExists, is("ok"));
+
+ String payloadJsonOrig = VIRT_APEX + "etc/microdroid_payload.json";
+ String mkPayload = VIRT_APEX + "bin/mk_payload";
+
+ // 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)
+ String apkPath = getDevice().executeShellV2Command("pm path com.android.microdroid.test")
+ .getStdout().trim();
+ assertTrue(apkPath.startsWith("package:"));
+ apkPath = apkPath.substring("package:".length());
+ apkPath = apkPath.replace("/", "\\\\/");
+
+ // Replace APK_PATH in the json file with the actual path of the test APK
String makePayloadCompositeCmd =
- String.format(
- "cd %s; %sbin/mk_payload %setc/microdroid_payload.json payload.img",
- TEST_ROOT, VIRT_APEX, VIRT_APEX);
+ "cd " + TEST_ROOT + ";" +
+ String.format("sed s/APK_PATH/%s/ %s > %s;", apkPath, payloadJsonOrig, "payload.json") +
+ mkPayload + " payload.json payload.img";
getDevice().executeShellCommand(makePayloadCompositeCmd);
// Make sure that the composite images are created
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 277ccc8..35f2f08 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -7,7 +7,7 @@
srcs: ["src/java/**/*.java"],
jni_libs: ["MicrodroidTestNativeLib"],
sdk_version: "current",
- apex_available: ["com.android.virt"], // TODO(jiyong): remove this from virt APEX
+ use_embedded_native_libs: true,
}
// TODO(jiyong): make this a binary, not a shared library
@@ -15,5 +15,21 @@
name: "MicrodroidTestNativeLib",
srcs: ["src/native/*.cpp"],
sdk_version: "current",
- apex_available: ["com.android.virt"], // TODO(jiyong): remove this from virt APEX
+}
+
+genrule {
+ name: "MicrodroidTestApp.signed",
+ out: [
+ "MicrodroidTestApp.apk",
+ "MicrodroidTestApp.apk.idsig",
+ ],
+ srcs: [":MicrodroidTestApp"],
+ tools:["apksigner"],
+ tool_files: ["test.keystore"],
+ cmd: "$(location apksigner) sign " +
+ "--ks $(location test.keystore) " +
+ "--ks-pass=pass:testkey --key-pass=pass:testkey " +
+ "--in $(in) " +
+ "--out $(genDir)/MicrodroidTestApp.apk",
+ // $(genDir)/MicrodroidTestApp.apk.idsig is generated implicitly
}
diff --git a/tests/testapk/test.keystore b/tests/testapk/test.keystore
new file mode 100644
index 0000000..2f024d8
--- /dev/null
+++ b/tests/testapk/test.keystore
Binary files differ