Bug 1164921 - part 2 - remove now-obsolete --enable-android-libstdcxx; r=glandium
authorNathan Froyd <froydnj@mozilla.com>
Thu, 15 Oct 2015 16:27:45 +0900
changeset 267827 dbf68a6a799a60096c67244300e3d6cf368661ed
parent 267826 b7bef3559a1cb7188cb8af730248c2fe6381529e
child 267828 198e766e025a34c55a4d08ee586c4f41e850d088
push id66604
push usermh@glandium.org
push dateThu, 15 Oct 2015 07:32:43 +0000
treeherdermozilla-inbound@198e766e025a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
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
Bug 1164921 - part 2 - remove now-obsolete --enable-android-libstdcxx; r=glandium
build/autoconf/android.m4
build/moz.build
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -21,22 +21,16 @@ MOZ_ARG_WITH_STRING(android-gnu-compiler
     android_gnu_compiler_version=$withval)
 
 MOZ_ARG_WITH_STRING(android-cxx-stl,
 [  --with-android-cxx-stl=VALUE
                           use the specified C++ STL (stlport, libstdc++, libc++)],
     android_cxx_stl=$withval,
     android_cxx_stl=mozstlport)
 
-MOZ_ARG_ENABLE_BOOL(android-libstdcxx,
-[  --enable-android-libstdcxx
-                          use GNU libstdc++ instead of STLPort],
-    MOZ_ANDROID_LIBSTDCXX=1,
-    MOZ_ANDROID_LIBSTDCXX= )
-
 define([MIN_ANDROID_VERSION], [9])
 android_version=MIN_ANDROID_VERSION
 
 MOZ_ARG_WITH_STRING(android-version,
 [  --with-android-version=VER
                           android platform version, default] MIN_ANDROID_VERSION,
     android_version=$withval)
 
@@ -263,17 +257,18 @@ if test "$OS_TARGET" = "Android" -a -z "
             ;;
         *)
             AC_MSG_ERROR([Bad value for --enable-android-cxx-stl])
             ;;
         esac
     fi
     CXXFLAGS="$CXXFLAGS $STLPORT_CPPFLAGS"
 fi
-AC_SUBST([MOZ_ANDROID_LIBSTDCXX])
+MOZ_ANDROID_CXX_STL=$android_cxx_stl
+AC_SUBST([MOZ_ANDROID_CXX_STL])
 AC_SUBST([STLPORT_LIBS])
 
 ])
 
 
 AC_DEFUN([concat],[$1$2$3$4])
 
 dnl Find a component of an AAR.
--- a/build/moz.build
+++ b/build/moz.build
@@ -10,17 +10,17 @@ with Files('**'):
 # This cannot be named "build" because of bug 922191.
 SPHINX_TREES['buildsystem'] = 'docs'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['win32']
 else:
     DIRS += ['unix']
 
-if CONFIG['OS_TARGET'] == 'Android' and not CONFIG['MOZ_ANDROID_LIBSTDCXX']:
+if CONFIG['OS_TARGET'] == 'Android' and CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
     DIRS += ['stlport']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['annotationProcessors']
     TEST_DIRS += [
         'mobile/sutagent/android',
         'mobile/sutagent/android/watcher',
         'mobile/sutagent/android/ffxcp',