1 files changed, 14 insertions, 6 deletions
diff --git a/host/libs/config/config_utils.cpp b/host/libs/config/config_utils.cpp
index 9197877dc..c4fea49cc 100644
--- a/host/libs/config/config_utils.cpp
+++ b/host/libs/config/config_utils.cpp
@@ -24,8 +24,10 @@
 #include <android-base/logging.h>
 #include <android-base/strings.h>
 
+#include "common/libs/utils/contains.h"
 #include "common/libs/utils/environment.h"
 #include "host/libs/config/config_constants.h"
+#include "host/libs/config/cuttlefish_config.h"
 
 namespace cuttlefish {
 
@@ -111,19 +113,17 @@ std::string HostBinaryDir() {
   return DefaultHostArtifactsPath("bin");
 }
 
-bool UseQemu8() {
+bool UseQemuPrebuilt() {
   const std::string target_prod_str = StringFromEnv("TARGET_PRODUCT", "");
-  if (HostArch() == Arch::X86_64 &&
-      target_prod_str.find("arm") == std::string::npos) {
+  if (!Contains(target_prod_str, "arm")) {
     return true;
   }
-
   return false;
 }
 
 std::string DefaultQemuBinaryDir() {
-  if (UseQemu8()) {
-    return HostBinaryDir();
+  if (UseQemuPrebuilt()) {
+    return HostBinaryDir() + "/" + HostArchStr() + "-linux-gnu/qemu";
   }
   return "/usr/bin";
 }
@@ -140,6 +140,14 @@ std::string HostUsrSharePath(const std::string& binary_name) {
   return DefaultHostArtifactsPath("usr/share/" + binary_name);
 }
 
+std::string HostQemuBiosPath() {
+  if (UseQemuPrebuilt()) {
+    return DefaultHostArtifactsPath(
+        "usr/share/qemu/" + HostArchStr() + "-linux-gnu");
+  }
+  return "/usr/share/qemu";
+}
+
 std::string DefaultGuestImagePath(const std::string& file_name) {
   return (StringFromEnv("ANDROID_PRODUCT_OUT", StringFromEnv("HOME", "."))) +
          file_name;