Support Android NDK r8b for x86 android build

RESOLVED FIXED in mozilla20

Status

defect
RESOLVED FIXED
7 years ago
a year ago

People

(Reporter: m_kato, Assigned: m_kato)

Tracking

Trunk
mozilla20
x86
Android
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

Assignee

Description

7 years ago
the prefix of toolchain is changed by NDK r8b...

Comment 1

7 years ago
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"
(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

7 years ago
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 ?
Supporting both is not hard.
Assignee

Updated

7 years ago
Blocks: 816993
Assignee

Comment 5

7 years ago
Posted patch fixSplinter Review
Attachment #692881 - Flags: review?(mh+mozilla)
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
Attachment #692881 - Flags: review?(mh+mozilla) → review+
Assignee

Comment 7

7 years ago
(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.
https://hg.mozilla.org/mozilla-central/rev/d3848ee8c9da
Assignee: nobody → m_kato
Status: NEW → RESOLVED
Last Resolved: 7 years ago
Resolution: --- → FIXED

Updated

a year ago
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.