Bug 1367201 - Add MOZ_ANDROID_MOZILLA_ONLINE build flag to support MozillaOnline (Mozilla China) custom code. r=nalexander
MozReview-Commit-ID: BB0dcmLez0w
--- 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)