Bug 1257958 - Move MOZ_LOCALE_SWITCHER to Python configure. r=nalexander

MozReview-Commit-ID: XcUdSQgVIg

mobile/android/base/moz.build

@@ -933,7 +933,7 @@ if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']:
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
-            'MOZ_ANDROID_GCM', 'MOZ_ANDROID_EXCLUDE_FONTS'):
+            'MOZ_ANDROID_GCM', 'MOZ_ANDROID_EXCLUDE_FONTS', 'MOZ_LOCALE_SWITCHER'):
     if CONFIG[var]:
         DEFINES[var] = 1
 

mobile/android/confvars.sh

@@ -54,9 +54,6 @@ fi
 # Enable UI for healthreporter
 MOZ_SERVICES_HEALTHREPORT=1
 
-# Enable runtime locale switching.
-MOZ_LOCALE_SWITCHER=1
-
 # Enable second screen using native Android libraries, provided we're
 # not resource constrained.
 if test -z "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then

mobile/android/moz.configure

@@ -8,6 +8,10 @@ env_flag('MOZ_ANDROID_EXCLUDE_FONTS',
          help='Whether to exclude font files from the build',
          default=True)
 
+env_flag('MOZ_LOCALE_SWITCHER',
+         help='Enable runtime locale switching',
+         default=True)
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':

old-configure.in

@@ -2746,7 +2746,6 @@ MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_ANDROID_BEAM=
-MOZ_LOCALE_SWITCHER=
 MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
@@ -3567,13 +3566,6 @@ if test -n "$MOZ_WEBSMS_BACKEND"; then
     AC_DEFINE(MOZ_WEBSMS_BACKEND)
 fi
 
-dnl ========================================================
-dnl = Enable runtime locale switching on Android
-dnl ========================================================
-if test -n "$MOZ_LOCALE_SWITCHER"; then
-    AC_DEFINE(MOZ_LOCALE_SWITCHER)
-fi
-
 dnl ========================================================
 dnl = Enable system download manager on Android
 dnl ========================================================
@@ -6841,7 +6833,6 @@ AC_SUBST(MOZ_D3DCOMPILER_XP_CAB)
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
-AC_SUBST(MOZ_LOCALE_SWITCHER)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_GCM)
 AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)