Bug 1196897 - Add flags to control using Switchboard in Fennec r=nalexander

configure.in

@@ -3781,6 +3781,7 @@ MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
 MOZ_INSTALL_TRACKING=
+MOZ_SWITCHBOARD=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
@@ -4877,6 +4878,13 @@ 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 ========================================================
@@ -8582,6 +8590,7 @@ AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
 AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
 AC_SUBST(MOZ_INSTALL_TRACKING)
+AC_SUBST(MOZ_SWITCHBOARD)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)

mobile/android/base/AppConstants.java.in

@@ -324,6 +324,13 @@ public class AppConstants {
     false;
 //#endif
 
+    public static final boolean MOZ_SWITCHBOARD =
+//#ifdef MOZ_SWITCHBOARD
+    true;
+//#else
+    false;
+//#endif
+
     public static final boolean MOZ_ANDROID_NATIVE_ACCOUNT_UI =
 //#ifdef MOZ_ANDROID_NATIVE_ACCOUNT_UI
     true;

mobile/android/confvars.sh

@@ -110,3 +110,10 @@ MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=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.
+if test "$NIGHTLY_BUILD"; then
+  MOZ_SWITCHBOARD=1
+fi

toolkit/modules/AppConstants.jsm

@@ -101,6 +101,13 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
+  MOZ_SWITCHBOARD:
+#ifdef MOZ_SWITCHBOARD
+  true,
+#else
+  false,
+#endif
+
   MOZ_WEBRTC:
 #ifdef MOZ_WEBRTC
   true,