Bug 1348820 - Remove MOZ_ANDROID_ACTIVITY_STREAM build flag. r?grisha draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Mon, 20 Mar 2017 14:31:33 +0100
changeset 502169 e952d8fc695bfee6bf7a43a7c31b5f416bb021b5
parent 501522 8d967436d696d1f8e3fb33cf7e3d32a72457ffa6
child 502170 ed85d991a058bd46098489790bd185e1a1e6f6fd
child 502184 57b704949c7d5123af41412bc3ab386d34a6deba
child 503512 dfacc08bae0af0929bba54a763e62bfc83a274d6
push id50209
push users.kaspari@gmail.com
push dateTue, 21 Mar 2017 11:11:06 +0000
reviewersgrisha
bugs1348820
milestone55.0a1
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
mobile/android/base/AppConstants.java.in
mobile/android/base/generate_build_config.py
mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStream.java
mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
mobile/android/base/moz.build
mobile/android/chrome/content/browser.js
mobile/android/moz.configure
toolkit/modules/AppConstants.jsm
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -313,16 +313,9 @@ public class AppConstants {
 //#ifdef MOZ_ANDROID_CUSTOM_TABS
     true;
 //#else
     false;
 //#endif
 
     // (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
 }
--- a/mobile/android/base/generate_build_config.py
+++ b/mobile/android/base/generate_build_config.py
@@ -32,18 +32,17 @@ from mozbuild.preprocessor import Prepro
 def main(output_file, input_filename):
     # input_filename is an absolute path, so there's no need to join with __DIR__.
     pp = Preprocessor(defines=buildconfig.defines, marker='//#')
 
     CONFIG = defaultdict(lambda: None)
     CONFIG.update(buildconfig.substs)
     DEFINES = {}
 
-    for var in ('MOZ_ANDROID_ACTIVITY_STREAM'
-                'MOZ_ANDROID_ANR_REPORTER',
+    for var in ('MOZ_ANDROID_ANR_REPORTER',
                 'MOZ_ANDROID_BEAM',
                 'MOZ_ANDROID_CUSTOM_TABS',
                 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
                 'MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
                 'MOZ_ANDROID_EXCLUDE_FONTS',
                 'MOZ_ANDROID_GCM',
                 'MOZ_ANDROID_MLS_STUMBLER',
                 'MOZ_ANDROID_SEARCH_ACTIVITY',
--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStream.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStream.java
@@ -58,21 +58,16 @@ public class ActivityStream {
         return GeckoSharedPrefs.forApp(context)
                 .getBoolean(GeckoPreferences.PREFS_ACTIVITY_STREAM, false);
     }
 
     /**
      * 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
             // to make really sure that this isn't riding the trains accidentally.
             return true;
         }
 
         // For everyone else activity stream is not available yet.
--- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
+++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
@@ -709,17 +709,16 @@ public class GeckoPreferences
                         continue;
                     }
                 } else if (PREFS_SCREEN_ADVANCED.equals(key) &&
                         !Restrictions.isAllowed(this, Restrictable.ADVANCED_SETTINGS)) {
                     preferences.removePreference(pref);
                     i--;
                     continue;
                 } else if (PREFS_CATEGORY_EXPERIMENTAL_FEATURES.equals(key)
-                        && !AppConstants.MOZ_ANDROID_ACTIVITY_STREAM
                         && !AppConstants.MOZ_ANDROID_CUSTOM_TABS) {
                     preferences.removePreference(pref);
                     i--;
                     continue;
                 }
                 setupPreferences((PreferenceGroup) pref, prefs);
             } else {
                 if (HANDLERS.containsKey(key)) {
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -1116,18 +1116,17 @@ if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRE
 # We do not expose MOZ_ADJUST_SDK_KEY 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_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_SWITCHBOARD', 'MOZ_ANDROID_CUSTOM_TABS',
-            'MOZ_ANDROID_ACTIVITY_STREAM'):
+            'MOZ_SWITCHBOARD', 'MOZ_ANDROID_CUSTOM_TABS'):
     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/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -4065,17 +4065,17 @@ Tab.prototype = {
           let listener = function() {
             this.browser.removeEventListener("click", ErrorPageEventHandler, true);
             this.browser.removeEventListener("pagehide", listener, true);
           }.bind(this);
 
           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);
           }
         }
 
         break;
       }
 
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -43,23 +43,16 @@ project_flag('MOZ_ANDROID_CUSTOM_TABS',
 
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
 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)
 
 set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
            depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True))
 
 imply_option('MOZ_SOCIAL', False)
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -297,23 +297,16 @@ this.AppConstants = Object.freeze({
 
   MOZ_GECKO_PROFILER:
 #ifdef MOZ_GECKO_PROFILER
   true,
 #else
   false,
 #endif
 
-  MOZ_ANDROID_ACTIVITY_STREAM:
-#ifdef MOZ_ANDROID_ACTIVITY_STREAM
-  true,
-#else
-  false,
-#endif
-
   DLL_PREFIX: "@DLL_PREFIX@",
   DLL_SUFFIX: "@DLL_SUFFIX@",
 
   MOZ_APP_NAME: "@MOZ_APP_NAME@",
   MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
   MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@",
   MOZ_BUILD_APP: "@MOZ_BUILD_APP@",
   MOZ_MACBUNDLE_NAME: "@MOZ_MACBUNDLE_NAME@",