Bug 1549416 - Use correct android tool prefix on 64 bits targets. r=glandium
authorEdouard Oger <eoger@fastmail.com>
Tue, 07 May 2019 09:03:46 -0700
changeset 4815 4d940761b90a7a6833a2860de84f940b8856af15
parent 4814 0f639641dbe69aaa754ea446d52125ba43c2b9a3
child 4816 87e3d40f7fef5b67a28d6160a731a2d3118078be
push id320
push userjjones@mozilla.com
push dateTue, 07 May 2019 16:12:20 +0000
reviewersglandium
bugs1549416
Bug 1549416 - Use correct android tool prefix on 64 bits targets. r=glandium
configure
configure.in
--- a/configure
+++ b/configure
@@ -2636,16 +2636,22 @@ fi
 
 # Check whether --with-android-platform was given.
 if test "${with_android_platform+set}" = set; then :
   withval=$with_android_platform; android_platform=$withval
 fi
 
 
 case "$target" in
+x86_64-linux*-android*)
+    android_tool_prefix="x86_64-linux-android"
+    ;;
+aarch64-linux*-android*)
+    android_tool_prefix="aarch64-linux-android"
+    ;;
 arm-linux*-android*|*-linuxandroid*)
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
     android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"
--- a/configure.in
+++ b/configure.in
@@ -128,16 +128,22 @@ AC_ARG_WITH(android-version,
     android_version=$withval)
 
 AC_ARG_WITH(android-platform,
 [  --with-android-platform=DIR
                           location of platform dir],
     android_platform=$withval)
 
 case "$target" in
+x86_64-linux*-android*)
+    android_tool_prefix="x86_64-linux-android"
+    ;;
+aarch64-linux*-android*)
+    android_tool_prefix="aarch64-linux-android"
+    ;;
 arm-linux*-android*|*-linuxandroid*)
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
     android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"