Backed out changeset 87e59d65e1b2 (bug 1367201) for crashes in Android's robocop tests, e.g. testANRReporter. r=backout

mobile/android/base/AppConstants.java.in

@@ -324,15 +324,5 @@ public class AppConstants {
         true;
 //#else
         false;
-//#endif
-    /**
-     * This flag is for enabling custom code used only in the
-     * MozillaOnline (Mozilla China) version of Fennec.
-     */
-    public static final boolean MOZ_ANDROID_MOZILLA_ONLINE =
-//#ifdef MOZ_ANDROID_MOZILLA_ONLINE
-        true;
-//#else
-        false;
 //#endif
 }

mobile/android/base/generate_build_config.py

@@ -36,7 +36,7 @@ def _defines():
     CONFIG.update(buildconfig.substs)
     DEFINES = dict(buildconfig.defines)
 
-    for var in ('MOZ_ANDROID_ACTIVITY_STREAM',
+    for var in ('MOZ_ANDROID_ACTIVITY_STREAM'
                 'MOZ_ANDROID_ANR_REPORTER',
                 'MOZ_ANDROID_BEAM',
                 'MOZ_ANDROID_CUSTOM_TABS',
@@ -46,7 +46,6 @@ def _defines():
                 'MOZ_ANDROID_GCM',
                 'MOZ_ANDROID_MLS_STUMBLER',
                 'MOZ_ANDROID_MMA',
-                'MOZ_ANDROID_MOZILLA_ONLINE',
                 'MOZ_LEANPLUM_SDK_KEY',
                 'MOZ_LEANPLUM_SDK_CLIENTID',
                 'MOZ_ANDROID_SEARCH_ACTIVITY',

mobile/android/moz.configure

@@ -83,13 +83,6 @@ option(env='MOZ_ANDROID_ACTIVITY_STREAM',
 set_config('MOZ_ANDROID_ACTIVITY_STREAM',
            depends_if('MOZ_ANDROID_ACTIVITY_STREAM')(lambda _: True))
 
-option(env='MOZ_ANDROID_MOZILLA_ONLINE',
-       help='Enable MozillaOnline (Mozilla China) specific Android code',
-       default=False)
-
-set_config('MOZ_ANDROID_MOZILLA_ONLINE',
-           depends_if('MOZ_ANDROID_MOZILLA_ONLINE')(lambda _: True))
-
 option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
        help='Build and package the install bouncer APK',
        default=True)