Merge "mk_payload is a host tool"
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index eb1339f..a0215c3 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -221,7 +221,7 @@
},
x86_64: {
kernel_prebuilt: ":kernel_prebuilts-5.10-x86_64",
- cmdline: microdroid_boot_cmdline + "pci=noacpi ",
+ cmdline: microdroid_boot_cmdline + "acpi=noirq",
},
},
dtb_prebuilt: "dummy_dtb.img",
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index 8881c51..aa7c9ab 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -73,6 +73,9 @@
tryRunOnMicrodroid("watch -e \"getprop debug.microdroid.test.keystore | grep '^$'\"");
assertThat(runOnMicrodroid("getprop", "debug.microdroid.test.keystore"), is("PASS"));
+ // Check that no denials have happened so far
+ assertThat(runOnMicrodroid("logcat -d -e 'avc:[[:space:]]{1,2}denied'"), is(""));
+
shutdownMicrodroid(getDevice(), cid);
}