commit c6930847115da384171b3eefb0fe3d62768cc8be
author Jiyong Park <jiyong@google.com> Mon Oct 17 17:00:45 2022 +0900
committer Jiyong Park <jiyong@google.com> Mon Oct 17 20:08:09 2022 +0900
tree ce164bb56ae07937f7ad1ca086c278c19c0e5d5b
parent 0f525b165c0fd69d69b434ae4f21fb2444a7317b

Use ro.product.vendor.device to determine if running on Cuttlefish

So far, we used ro.product.name to check if the tests are running on
Cuttlefish or not. However, that is errorprone because Cuttlefish (as a
device) can run different variants of Android having different
ro.product.name values. For example, the prop is aosp_[arch] for GSI
(Generic System Image).

Fix this by using the device name that is in the vendor partition. The
partition is not replaced even with GSI.

Bug: 253638551
Test: run MicrodroidHostTestCases -- --abi x86_64 on Cuttlefish running
GSI

Change-Id: I6671d27a58bc4bcf7a209bbbfd7fdc5f0417ac68

tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java

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 c2fd295..3052c85 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
@@ -49,7 +49,8 @@
 
 public abstract class MicrodroidDeviceTestBase {
     public static boolean isCuttlefish() {
-        return VirtualizationTestHelper.isCuttlefish(SystemProperties.get("ro.product.name"));
+        return VirtualizationTestHelper.isCuttlefish(
+                SystemProperties.get("ro.product.vendor.device"));
     }
 
     public static String getMetricPrefix() {

tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java

diff --git a/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java b/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java
index c6c0ad0..4c27915 100644
--- a/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java
+++ b/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java
@@ -16,11 +16,7 @@
 package com.android.virt;
 
 public abstract class VirtualizationTestHelper {
-    public static boolean isCuttlefish(String productName) {
-        return (null != productName)
-                && (productName.startsWith("aosp_cf_x86")
-                        || productName.startsWith("aosp_cf_arm")
-                        || productName.startsWith("cf_x86")
-                        || productName.startsWith("cf_arm"));
+    public static boolean isCuttlefish(String vendorDeviceName) {
+        return vendorDeviceName != null && vendorDeviceName.startsWith("vsoc_");
     }
 }

tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java

diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
index 2df829c..6346288 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -95,7 +95,8 @@
     }
 
     protected boolean isCuttlefish() throws Exception {
-        return VirtualizationTestHelper.isCuttlefish(getDevice().getProperty("ro.product.name"));
+        return VirtualizationTestHelper.isCuttlefish(
+            getDevice().getProperty("ro.product.vendor.device"));
     }
 
     protected String getMetricPrefix() throws Exception {