670315 - Add option to use GNU libstdc++ under Android NDK5

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Patch to add MOZ_USE_GNU_LIBSTDCXX flag (v1)

Currently we use STLPort under NDK5, but it's possible to use libstdc++ as well. NDK5 actually includes a copy of libstdc++ but it was compiled without wchar_t support and apparently IPC code requires it. So it's necessary to replace NDK5's copy of libstdc++ if we want to use it. A version with wchar_t support is available at http://people.mozilla.org/~nchen/gnu-libstdc++.tar.bz2

The attached patch checks if MOZ_USE_GNU_LIBSTDCXX is set and switches to using libstdc++ instead of STLPort. It also fixes some problems with the build flags. I don't know how to add a proper config option, so this patch may need some major rework.

Comment 1

[Brad Lassey [:blassey] (use needinfo?)]

adding a configure flag is pretty strait forward. You probably want a boolean, so --enable-profiling is a good one to mimic:
http://mxr.mozilla.org/mozilla-central/source/configure.in#1804

Comment 2

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Patch to add --enable-android-libstdcxx option (v2)

Renamed flag to --enable-android-libstdcxx because it's only applicable to Android

Comment 3

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 545281 [details] [diff] [review]
Patch to add --enable-android-libstdcxx option (v2)

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

This looks fine, I'm just assuming the paths are right though ....

::: configure.in
@@ +326,5 @@
> +          STL_LIBS="-lstdc++"
> +          STL_LDFLAGS="-L$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
> +       fi
> +    else
> +       if test -e "$android_ndk/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a" ; then

nit: elif

::: js/src/configure.in
@@ +317,5 @@
> +          STL_LIBS="-lstdc++"
> +          STL_LDFLAGS="-L$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
> +       fi
> +    else
> +       if test -e "$android_ndk/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a" ; then

nit elif

Comment 4

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Patch to add --enable-android-libstdcxx option (v2.1)

Carry over khuey's r+

Comment 5

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Patch conflicts with bug 671346.

Comment 6

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Patch to add --enable-android-libstdcxx option (v3)

Requesting review again because of additional change to accommodate bug 671346. Thanks!

Comment 7

[Alon Zakai (:azakai)]

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

Comment 8

[Marco Bonardo [:mak]]

http://hg.mozilla.org/mozilla-central/rev/f06039afefb9