802527 - Support Android NDK r8b for x86 android build

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Makoto Kato [:m_kato]]

the prefix of toolchain is changed by NDK r8b...

Comment 1

[Aissen]

I built it successfully. Here's the "trivial" fix:

diff -r aa367b01df3f build/autoconf/android.m4
--- a/build/autoconf/android.m4 Sun Oct 28 13:11:28 2012 -0700
+++ b/build/autoconf/android.m4 Mon Oct 29 07:45:32 2012 +0000
@@ -40,7 +40,7 @@
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
-    android_tool_prefix="i686-android-linux"
+    android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"
diff -r aa367b01df3f js/src/build/autoconf/android.m4
--- a/js/src/build/autoconf/android.m4  Sun Oct 28 13:11:28 2012 -0700
+++ b/js/src/build/autoconf/android.m4  Mon Oct 29 07:45:32 2012 +0000
@@ -40,7 +40,7 @@
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
-    android_tool_prefix="i686-android-linux"
+    android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"
diff -r aa367b01df3f nsprpub/configure
--- a/nsprpub/configure Sun Oct 28 13:11:28 2012 -0700
+++ b/nsprpub/configure Mon Oct 29 07:45:32 2012 +0000
@@ -878,7 +878,7 @@
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
-    android_tool_prefix="i686-android-linux"
+    android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"
diff -r aa367b01df3f nsprpub/configure.in
--- a/nsprpub/configure.in      Sun Oct 28 13:11:28 2012 -0700
+++ b/nsprpub/configure.in      Mon Oct 29 07:45:32 2012 +0000
@@ -127,7 +127,7 @@
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
-    android_tool_prefix="i686-android-linux"
+    android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"

Comment 2

[Mike Hommey [:glandium]]

(In reply to Aissen from comment #1)
> I built it successfully. Here's the "trivial" fix:

Unfortunately, that would break building with an older NDK.

Comment 3

[Aissen]

I'm new here, so I don't know how this works. I'm guessing an overnight switch to the new NDK is out of the question ?

Comment 4

[Mike Hommey [:glandium]]

Supporting both is not hard.

Comment 5

[Makoto Kato [:m_kato]]

Attachment: fix

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 692881 [details] [diff] [review]
fix

Review of attachment 692881 [details] [diff] [review]:
-----------------------------------------------------------------

Don't you need the same thing for nspr?

::: build/autoconf/android.m4
@@ +118,5 @@
>              AC_MSG_ERROR([not found. You have to specify --with-android-platform=/path/to/ndk/platform.])
>          fi
>      fi
>  
> +    dnl Old NDK support. If minimum requrement is changed to NDK r8b,

requirement

Comment 7

[Makoto Kato [:m_kato]]

(In reply to Mike Hommey [:glandium] from comment #6)
> Comment on attachment 692881 [details] [diff] [review]
> fix
> 
> Review of attachment 692881 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Don't you need the same thing for nspr?

It is necessary for NSPR too, so I will file/handle a bug for NSPR.

Comment 8

[Makoto Kato [:m_kato]]

http://hg.mozilla.org/integration/mozilla-inbound/rev/d3848ee8c9da

Comment 9

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/d3848ee8c9da