Fixup for b2g bustage from bug 1164921. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 15 Oct 2015 17:10:03 +0900
changeset 267864 7e611493c5caedd3eb6b9a7cd01c4da778363d95
parent 267863 a792738b876e4283555fddc2c04aeffa7f482bec
child 267865 b5c8fe5fe5ab7d078a2c8243d0529446813725b9
push id29532
push userkwierso@gmail.com
push dateThu, 15 Oct 2015 18:18:03 +0000
treeherdermozilla-central@79e2c92160d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1164921
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fixup for b2g bustage from bug 1164921. r=me
configure.in
--- a/configure.in
+++ b/configure.in
@@ -313,16 +313,17 @@ if test -n "$gonkdir" ; then
 
     AC_DEFINE(ANDROID)
     AC_DEFINE_UNQUOTED(ANDROID_VERSION, $ANDROID_VERSION)
     AC_SUBST(ANDROID_VERSION)
     AC_DEFINE(HAVE_SYS_UIO_H)
     AC_DEFINE(HAVE_PTHREADS)
     MOZ_CHROME_FILE_FORMAT=omni
     direct_nspr_config=1
+    android_cxx_stl=mozstlport
 else
     MOZ_ANDROID_NDK
 
     case "$target" in
     *-android*|*-linuxandroid*)
         if test -z "$ANDROID_PACKAGE_NAME" ; then
             ANDROID_PACKAGE_NAME='org.mozilla.$(MOZ_APP_NAME)'
         fi