Don't assume fetch_cvd is in an android build

Bug: 332394732
Test: None
Change-Id: Ia49021d2f95b824e3d78ee8a992f81933447bad4

1 files changed, 1 insertions, 9 deletions

diff --git a/src/com/android/tradefed/device/cloud/OxygenClient.java b/src/com/android/tradefed/device/cloud/OxygenClient.java
index 4e8ec7ee2..0d897e5b0 100644
--- a/src/com/android/tradefed/device/cloud/OxygenClient.java
+++ b/src/com/android/tradefed/device/cloud/OxygenClient.java
@@ -160,9 +160,7 @@ public class OxygenClient {
             return null;
         }
 
-        String path = deviceOptions.getExtraOxygenArgs().get("override_fetch_cvd_path");
-        // An empty string is used to represent fetch_cvd from the build being tested.
-        return path == null ? "" : path;
+        return deviceOptions.getExtraOxygenArgs().get("override_fetch_cvd_path");
     }
 
     /**
@@ -265,12 +263,6 @@ public class OxygenClient {
         String override_fetch_cvd_path = getOverrideFetchCvdPath(deviceOptions);
         if (override_fetch_cvd_path != null) {
             oxygenClientArgs.add("-override_fetch_cvd_path");
-            // If the path is not specified, use the fetch_cvd in BuildInfo.
-            if (override_fetch_cvd_path.isEmpty()) {
-                String build_target =
-                        b.getBuildAttributes().getOrDefault("build_target", b.getBuildFlavor());
-                override_fetch_cvd_path = String.format("ab/%s/%s", b.getBuildId(), build_target);
-            }
             oxygenClientArgs.add(override_fetch_cvd_path);
         }