From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- build/moz.configure/init.configure | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'build/moz.configure/init.configure') diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 87120573a0..bfb878aebb 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -739,11 +739,10 @@ def real_target(value, host, shell, project, application): project = project[0] if not value: if project == "mobile/android": - target_cpu, target_system = ( - ("aarch64", "android") - if host.cpu == "aarch64" - else ("arm", "androideabi") - ) + target_cpu, target_system = { + "aarch64": ("aarch64", "android"), + "x86_64": ("x86_64", "android"), + }.get(host.cpu, ("arm", "androideabi")) return split_triplet(f"{target_cpu}-unknown-linux-{target_system}") if project == "mobile/ios": return split_triplet("aarch64-apple-ios") -- cgit v1.2.3