Bug 1257958 - Move MOZ_SWITCHBOARD to Python configure. r=nalexander
authorChris Manchester <cmanchester@mozilla.com>
Fri, 22 Apr 2016 13:01:22 -0700
changeset 294539 ea3a604240fa9fd53bec9676f2489b6b0ef6a4fc
parent 294538 356573b6a2eda7fab8c3310319b63bdcc8cfbce9
child 294540 e6650e1461ff7f12aa73394fc18658cf6c84036a
push id75584
push usercmanchester@mozilla.com
push dateFri, 22 Apr 2016 20:01:27 +0000
treeherdermozilla-inbound@e6650e1461ff [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_SWITCHBOARD to Python configure. r=nalexander MozReview-Commit-ID: CRWP2JugKeA
mobile/android/base/moz.build
mobile/android/confvars.sh
mobile/android/moz.configure
old-configure.in
toolkit/modules/moz.build
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -929,17 +929,18 @@ 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_LOCALE_SWITCHER',
-            'MOZ_ANDROID_BEAM', 'MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE'):
+            'MOZ_ANDROID_BEAM', 'MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
+            'MOZ_SWITCHBOARD'):
     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
@@ -74,13 +74,8 @@ MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
 
 # Enable C++ APZ.
 MOZ_ANDROID_APZ=1
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
-
-# Enable the Switchboard A/B framework code.
-# Note: The framework is always included in the app. This flag controls
-# usage of the framework.
-MOZ_SWITCHBOARD=1
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -32,16 +32,23 @@ env_flag('MOZ_ANDROID_SEARCH_ACTIVITY',
 env_flag('MOZ_ANDROID_MLS_STUMBLER',
          help='Include Mozilla Location Service Stumbler on Android',
          default=True)
 
 env_flag('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
          help='Background service for downloading additional content at runtime',
          default=True)
 
+# Enable the Switchboard A/B framework code.
+# Note: The framework is always included in the app. This flag controls
+# usage of the framework.
+env_flag('MOZ_SWITCHBOARD',
+         help='Include Switchboard A/B framework on Android',
+         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
@@ -2742,17 +2742,16 @@ 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_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
-MOZ_SWITCHBOARD=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
 MOZ_PAY=
 MOZ_AUDIO_CHANNEL_MANAGER=
 MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
@@ -3572,23 +3571,16 @@ fi
 dnl ========================================================
 dnl = Include install tracking on Android
 dnl ========================================================
 if test -n "$MOZ_INSTALL_TRACKING"; then
     AC_DEFINE(MOZ_INSTALL_TRACKING)
 fi
 
 dnl ========================================================
-dnl = Include Switchboard A/B framework on Android
-dnl ========================================================
-if test -n "$MOZ_SWITCHBOARD"; then
-    AC_DEFINE(MOZ_SWITCHBOARD)
-fi
-
-dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
 MOZ_IPDL_TESTS=
 
 MOZ_ARG_ENABLE_BOOL(ipdl-tests,
 [  --enable-ipdl-tests     Enable expensive IPDL tests],
     MOZ_IPDL_TESTS=1,
     MOZ_IPDL_TESTS=)
@@ -6789,17 +6781,16 @@ AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
 AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
 AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
 AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 AC_SUBST(MOZ_INSTALL_TRACKING)
-AC_SUBST(MOZ_SWITCHBOARD)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
 AC_SUBST(USE_ELF_HACK)
 AC_SUBST(INCREMENTAL_LINKER)
 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
 
 AC_SUBST(MOZ_FIX_LINK_PATHS)
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -124,13 +124,14 @@ for var in ('ANDROID_PACKAGE_NAME',
             'DLL_PREFIX',
             'DLL_SUFFIX',
             'DEBUG_JS_MODULES'):
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZ_TOOLKIT_SEARCH',
             'MOZ_REQUIRE_SIGNING',
             'MOZ_SYSTEM_NSS',
-            'MOZ_UPDATER'):
+            'MOZ_UPDATER',
+            'MOZ_SWITCHBOARD'):
     if CONFIG[var]:
         DEFINES[var] = True
 
 DEFINES['TOPOBJDIR'] = TOPOBJDIR