Bug 1132185 - Put the tab queue UI behind a build flag (r=nalexander)

configure.in

@@ -5021,6 +5021,13 @@ if test -n "$MOZ_ANDROID_SHARE_OVERLAY"; then
     AC_DEFINE(MOZ_ANDROID_SHARE_OVERLAY)
 fi
 
+dnl = Include Tab Queue on Android
+dnl = Temporary build flag to allow development in Nightly
+dnl ========================================================
+if test -n "$MOZ_ANDROID_TAB_QUEUE"; then
+    AC_DEFINE(MOZ_ANDROID_TAB_QUEUE)
+fi
+
 dnl ========================================================
 dnl = Include New Tablet UI on Android
 dnl = Temporary build flag to allow development in Nightly
@@ -8526,6 +8533,7 @@ AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_READING_LIST_SERVICE)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
+AC_SUBST(MOZ_ANDROID_TAB_QUEUE)
 AC_SUBST(MOZ_ANDROID_NEW_TABLET_UI)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)

mobile/android/base/AppConstants.java.in

@@ -173,6 +173,13 @@ public class AppConstants {
     false;
 //#endif
 
+    public static final boolean MOZ_ANDROID_TAB_QUEUE =
+//#ifdef MOZ_ANDROID_TAB_QUEUE
+    true;
+//#else
+    false;
+//#endif
+
     public static final String TELEMETRY_PREF_NAME =
           "toolkit.telemetry.enabled";
 

mobile/android/base/moz.build

@@ -683,7 +683,7 @@ ANDROID_GENERATED_RESFILES += [
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
-            'MOZ_ANDROID_NEW_TABLET_UI'):
+            'MOZ_ANDROID_NEW_TABLET_UI', 'MOZ_ANDROID_TAB_QUEUE'):
     if CONFIG[var]:
         DEFINES[var] = 1