Bug 1348820 - Remove MOZ_ANDROID_ACTIVITY_STREAM build flag. r=Grisha

This flag wasn't used in the build system anyways. It was used to hide early builds of the
new Activity Stream UI. However this is now going to be controlled by Switchboard experiments.

MozReview-Commit-ID: Dfzw9YGgHkN

--HG--
extra : rebase_source : 2ecd3fb18a237f0de8e7d4752d69de568c062310

mobile/android/base/AppConstants.java.in

@@ -318,11 +318,4 @@ public class AppConstants {
 
     // (bug 1266820) Temporarily disabled since no one is working on it.
     public static final boolean SCREENSHOTS_IN_BOOKMARKS_ENABLED = false;
-
-    public static final boolean MOZ_ANDROID_ACTIVITY_STREAM =
-//#ifdef MOZ_ANDROID_ACTIVITY_STREAM
-        true;
-//#else
-        false;
-//#endif
 }

mobile/android/base/generate_build_config.py

@@ -37,8 +37,7 @@ def main(output_file, input_filename):
     CONFIG.update(buildconfig.substs)
     DEFINES = {}
 
-    for var in ('MOZ_ANDROID_ACTIVITY_STREAM'
+    for var in ('MOZ_ANDROID_ANR_REPORTER',
-                'MOZ_ANDROID_ANR_REPORTER',
                 'MOZ_ANDROID_BEAM',
                 'MOZ_ANDROID_CUSTOM_TABS',
                 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',

mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStream.java

@@ -63,11 +63,6 @@ public class ActivityStream {
      * Is the user eligible to use activity stream or should we hide it from settings etc.?
      */
     public static boolean isUserEligible(Context context) {
-        if (AppConstants.MOZ_ANDROID_ACTIVITY_STREAM) {
-            // If the build flag is enabled then just show the option to the user.
-            return true;
-        }
-
         if (AppConstants.NIGHTLY_BUILD && SwitchBoard.isInExperiment(context, Experiments.ACTIVITY_STREAM)) {
             // If this is a nightly build and the user is part of the activity stream experiment then
             // the option should be visible too. The experiment is limited to Nightly too but I want

mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java

@@ -714,7 +714,6 @@ public class GeckoPreferences
                     i--;
                     continue;
                 } else if (PREFS_CATEGORY_EXPERIMENTAL_FEATURES.equals(key)
-                        && !AppConstants.MOZ_ANDROID_ACTIVITY_STREAM
                         && !AppConstants.MOZ_ANDROID_CUSTOM_TABS) {
                     preferences.removePreference(pref);
                     i--;

mobile/android/base/moz.build

@@ -1123,8 +1123,7 @@ for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_DEBUG',
             '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_SWITCHBOARD', 'MOZ_ANDROID_CUSTOM_TABS',
+            'MOZ_SWITCHBOARD', 'MOZ_ANDROID_CUSTOM_TABS'):
-            'MOZ_ANDROID_ACTIVITY_STREAM'):
     if CONFIG[var]:
         DEFINES[var] = 1
 

mobile/android/chrome/content/browser.js

@@ -4080,7 +4080,7 @@ Tab.prototype = {
           this.browser.addEventListener("pagehide", listener, true);
         }
 
-        if (AppConstants.NIGHTLY_BUILD || AppConstants.MOZ_ANDROID_ACTIVITY_STREAM) {
+        if (AppConstants.NIGHTLY_BUILD) {
           if (!docURI.startsWith("about:")) {
             WebsiteMetadata.parseAsynchronously(this.browser.contentDocument);
           }

mobile/android/moz.configure

@@ -48,13 +48,6 @@ project_flag('MOZ_SWITCHBOARD',
              help='Include Switchboard A/B framework on Android',
              default=True)
 
-option(env='MOZ_ANDROID_ACTIVITY_STREAM',
-       help='Enable Activity Stream on Android (replacing the default HomePager)',
-       default=False)
-
-set_config('MOZ_ANDROID_ACTIVITY_STREAM',
-           depends_if('MOZ_ANDROID_ACTIVITY_STREAM')(lambda _: True))
-
 option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
        help='Build and package the install bouncer APK',
        default=True)

toolkit/modules/AppConstants.jsm

@@ -302,13 +302,6 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
-  MOZ_ANDROID_ACTIVITY_STREAM:
-#ifdef MOZ_ANDROID_ACTIVITY_STREAM
-  true,
-#else
-  false,
-#endif
-
   DLL_PREFIX: "@DLL_PREFIX@",
   DLL_SUFFIX: "@DLL_SUFFIX@",