commit 9dbbd27e62be9b26712ea68fb15830cc132367fc
parent 068a362bab98013538c171eb7437418904aba687
Author: Jamie Nicol <jnicol@mozilla.com>
Date: Mon, 1 Dec 2025 17:08:35 +0000
Bug 2003006 - Launch x86_64 AVD when targeting aarch64 but running on x86_64 host. r=mozbase-reviewers,jmaher
Currently `./mach android-emulator` will attempt to launch an arm64
AVD, which likely will fail due to not existing as boostrap will have
only downloaded an x86_64 AVD. The x86_64 AVD downloaded by bootstrap
is capable of running aarch64 APKs, so we should launch it.
Differential Revision: https://phabricator.services.mozilla.com/D274427
Diffstat:
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
@@ -836,7 +836,10 @@ class AndroidEmulator:
return False
if self.avd_info.x86:
_log_info(
- "Running the x86/x86_64 emulator; be sure to install an x86 or x86_64 APK!"
+ "Running the x86_64 emulator; be sure to install a compatible APK!"
+ )
+ _log_info(
+ "AArch64 APKs are supported but will perform poorly compared to x86_64."
)
else:
_log_info("Running the arm emulator; be sure to install an arm APK!")
@@ -958,7 +961,8 @@ class AndroidEmulator:
return requested
if self.substs:
target_cpu = self.substs["TARGET_CPU"]
- if target_cpu == "aarch64":
+ host_cpu = self.substs["HOST_CPU_ARCH"]
+ if host_cpu == "aarch64" and target_cpu == "aarch64":
return "arm64"
elif target_cpu.startswith("arm"):
return "arm"
