Revert "Enable verifying vendor partition"
This reverts commit 7012b007d007b4b1cf138767e564b515b1b2537c.
Reason for revert: Potential culprit of b/317588360.
Change-Id: I04d2cc9eb9a1d4b1b2a5df6096950a7ee70a10ae
diff --git a/microdroid/fstab.microdroid b/microdroid/fstab.microdroid
index 2742757..da000b9 100644
--- a/microdroid/fstab.microdroid
+++ b/microdroid/fstab.microdroid
@@ -2,4 +2,6 @@
# This is a temporary solution to unblock other devs that depend on /vendor partition in Microdroid
# The /vendor partition will only be mounted if the kernel cmdline contains
# androidboot.microdroid.mount_vendor=1.
-/dev/block/by-name/microdroid-vendor /vendor ext4 noatime,ro,errors=panic wait,first_stage_mount,avb_hashtree_digest=/sys/firmware/devicetree/base/avf/vendor_hashtree_descriptor_root_digest
+# TODO(b/285855430): this should probably be defined in the DT
+# TODO(b/285855436): should be mounted on top of dm-verity device
+/dev/block/by-name/microdroid-vendor /vendor ext4 noatime,ro,errors=panic wait,first_stage_mount
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index 7761af9..1917654 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -262,16 +262,6 @@
@Test
public void testMicrodroidDebugBootTime_withVendorPartition() throws Exception {
- assume().withMessage(
- "Cuttlefish doesn't support device tree under"
- + " /sys/firmware/devicetree/base")
- .that(isCuttlefish())
- .isFalse();
- // TODO(b/317567210): Boots fails with vendor partition in HWASAN enabled microdroid
- // after introducing verification based on DT and fstab in microdroid vendor partition.
- assume().withMessage("boot with vendor partition is failing in HWASAN enabled Microdroid.")
- .that(isHwasan())
- .isFalse();
assumeFeatureEnabled(VirtualMachineManager.FEATURE_VENDOR_MODULES);
File vendorDiskImage =
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index 817bd85..b7a34ae 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -62,10 +62,6 @@
return getDeviceProperties().isCuttlefish();
}
- public static boolean isHwasan() {
- return getDeviceProperties().isHwasan();
- }
-
public static boolean isUserBuild() {
return getDeviceProperties().isUserBuild();
}
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index b98b474..b06eea6 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -32,7 +32,6 @@
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
-import static org.junit.Assume.assumeFalse;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
@@ -2107,13 +2106,6 @@
@Test
public void configuringVendorDiskImageRequiresCustomPermission() throws Exception {
assumeSupportedDevice();
- assumeFalse(
- "Cuttlefish doesn't support device tree under /sys/firmware/devicetree/base",
- isCuttlefish());
- // TODO(b/317567210): Boots fails with vendor partition in HWASAN enabled microdroid
- // after introducing verification based on DT and fstab in microdroid vendor partition.
- assumeFalse(
- "boot with vendor partition is failing in HWASAN enabled Microdroid.", isHwasan());
assumeFeatureEnabled(VirtualMachineManager.FEATURE_VENDOR_MODULES);
File vendorDiskImage =
@@ -2139,13 +2131,6 @@
@Test
public void bootsWithVendorPartition() throws Exception {
assumeSupportedDevice();
- assumeFalse(
- "Cuttlefish doesn't support device tree under /sys/firmware/devicetree/base",
- isCuttlefish());
- // TODO(b/317567210): Boots fails with vendor partition in HWASAN enabled microdroid
- // after introducing verification based on DT and fstab in microdroid vendor partition.
- assumeFalse(
- "boot with vendor partition is failing in HWASAN enabled Microdroid.", isHwasan());
assumeFeatureEnabled(VirtualMachineManager.FEATURE_VENDOR_MODULES);
grantPermission(VirtualMachine.USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION);
@@ -2177,13 +2162,6 @@
@Test
public void creationFailsWithUnsignedVendorPartition() throws Exception {
assumeSupportedDevice();
- assumeFalse(
- "Cuttlefish doesn't support device tree under /sys/firmware/devicetree/base",
- isCuttlefish());
- // TODO(b/317567210): Boots fails with vendor partition in HWASAN enabled microdroid
- // after introducing verification based on DT and fstab in microdroid vendor partition.
- assumeFalse(
- "boot with vendor partition is failing in HWASAN enabled Microdroid.", isHwasan());
assumeFeatureEnabled(VirtualMachineManager.FEATURE_VENDOR_MODULES);
grantPermission(VirtualMachine.USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION);