Bug 1257958 - Move MOZ_LOCALE_SWITCHER to Python configure. r=nalexander
authorChris Manchester <cmanchester@mozilla.com>
Fri, 22 Apr 2016 13:01:21 -0700
changeset 332465 ddcd38c4444fd5c0ba9295006a62e9a2186e0f07
parent 332464 083f95a42cc87c8da3d9ebe3090c8c90cf036406
child 332466 755ad040785fd75084ff049b5f1184e5adf5befb
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1257958
milestone48.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 1257958 - Move MOZ_LOCALE_SWITCHER to Python configure. r=nalexander MozReview-Commit-ID: XcUdSQgVIg
mobile/android/base/moz.build
mobile/android/confvars.sh
mobile/android/moz.configure
old-configure.in
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -928,17 +928,17 @@ if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRE
         ]
 
 # We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN here because that
 # would leak the value to build logs.  Instead we expose the token quietly where
 # appropriate in Makefile.in.
 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
 
 for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL', 'MOZ_ANDROID_GCM_SENDERID'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
 for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH',
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -49,19 +49,16 @@ MOZ_APP_STATIC_INI=1
 # build szip to use during packaging.
 if test "$COMPILE_ENVIRONMENT"; then
 MOZ_ENABLE_SZIP=1
 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
   MOZ_NATIVE_DEVICES=1
 fi
 
 # Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES
 # is a proxy flag for that support.
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -3,16 +3,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 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':
         log.error('You must specify --target=arm-linux-androideabi (or some '
                   'other valid Android target) when building mobile/android.')
         die('See https://developer.mozilla.org/docs/Mozilla/Developer_guide/'
             'Build_Instructions/Simple_Firefox_for_Android_build '
             'for more information about the necessary options.')
--- a/old-configure.in
+++ b/old-configure.in
@@ -2741,17 +2741,16 @@ NECKO_PROTOCOLS_DEFAULT="about app data 
 if test -n "$MOZ_RTSP"; then
   NECKO_PROTOCOLS_DEFAULT="$NECKO_PROTOCOLS_DEFAULT rtsp"
 fi
 BUILD_CTYPES=1
 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=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
 MOZ_SWITCHBOARD=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
@@ -3563,23 +3562,16 @@ MOZ_ARG_DISABLE_BOOL(websms-backend,
     MOZ_WEBSMS_BACKEND=,
     MOZ_WEBSMS_BACKEND=1)
 
 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 ========================================================
 if test -n "$MOZ_ANDROID_DOWNLOADS_INTEGRATION"; then
     AC_DEFINE(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 fi
 
 dnl ========================================================
 dnl = Enable NFC permission on Android
@@ -6836,17 +6828,16 @@ AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL)
 AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL_PATH)
 AC_SUBST(MOZ_DIRECTX_SDK_PATH)
 AC_SUBST(MOZ_D3DCOMPILER_XP_DLL)
 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)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)