Bug 1367201 - Add MOZ_ANDROID_MOZILLA_ONLINE build flag to support MozillaOnline (Mozilla China) custom code. r=nalexander
authorMichael Kaply <mozilla@kaply.com>
Mon, 05 Jun 2017 14:42:53 -0500
changeset 412888 80c6e635835034ae5953a26fe5edb8aba060848f
parent 412887 be7694b72c8a3d5de5451901d1bc268cf73021a2
child 412889 abdb02413a9ff59a772fd0b71069afcc4928e12f
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1367201
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1367201 - Add MOZ_ANDROID_MOZILLA_ONLINE build flag to support MozillaOnline (Mozilla China) custom code. r=nalexander MozReview-Commit-ID: BB0dcmLez0w
mobile/android/base/AppConstants.java.in
mobile/android/base/generate_build_config.py
mobile/android/moz.configure
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -313,9 +313,19 @@ public class AppConstants {
     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
+    /**
+     * 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
 }
--- a/mobile/android/base/generate_build_config.py
+++ b/mobile/android/base/generate_build_config.py
@@ -40,16 +40,17 @@ def _defines():
                 'MOZ_ANDROID_ANR_REPORTER',
                 'MOZ_ANDROID_BEAM',
                 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
                 'MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
                 'MOZ_ANDROID_EXCLUDE_FONTS',
                 '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',
                 'MOZ_CRASHREPORTER',
                 'MOZ_DEBUG',
                 'MOZ_INSTALL_TRACKING',
                 'MOZ_LOCALE_SWITCHER',
                 'MOZ_NATIVE_DEVICES',
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -81,16 +81,23 @@ project_flag('MOZ_ANDROID_HLS_SUPPORT',
 
 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_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)
 
 set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
            depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True))
 
 imply_option('MOZ_SOCIAL', False)