Bug 1055264 : Build flags added for firefox account profile -r=nalexander.
authorvivek <vivekb.balakrishnan@gmail.com>
Wed, 10 Jun 2015 21:22:00 -0700
changeset 248144 7366c6cd00a62d3f147e186fbd2abe3df210d51f
parent 248143 bb0362a2505f2566dfee90c9eebab0db037c003b
child 248145 d5a9b215cac9ab9771908b851e32703cec59a0ee
push id28892
push usercbook@mozilla.com
push dateThu, 11 Jun 2015 12:41:51 +0000
treeherdermozilla-central@9ebd530c5843 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1055264
milestone41.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 1055264 : Build flags added for firefox account profile -r=nalexander.
configure.in
mobile/android/base/AppConstants.java.in
mobile/android/base/moz.build
mobile/android/confvars.sh
--- a/configure.in
+++ b/configure.in
@@ -4947,16 +4947,23 @@ fi
 
 dnl ========================================================
 dnl = Include share overlay on Android
 dnl ========================================================
 if test -n "$MOZ_ANDROID_SHARE_OVERLAY"; then
     AC_DEFINE(MOZ_ANDROID_SHARE_OVERLAY)
 fi
 
+dnl ========================================================
+dnl = Show Firefox Account profile details on Android
+dnl ========================================================
+if test -n "$MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES"; then
+    AC_DEFINE(MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES)
+fi
+
 dnl = Include Tab Queue on Android
 dnl = Temporary build flag to allow development in Nightly
 dnl ========================================================
 if test -n "$MOZ_ANDROID_TAB_QUEUE"; then
     AC_DEFINE(MOZ_ANDROID_TAB_QUEUE)
 fi
 
 dnl ========================================================
@@ -8535,16 +8542,17 @@ AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
 AC_SUBST(MOZ_LOCALE_SWITCHER)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_READING_LIST_SERVICE)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
+AC_SUBST(MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES)
 AC_SUBST(MOZ_ANDROID_TAB_QUEUE)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
 AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
 AC_SUBST(MOZ_INSTALL_TRACKING)
 AC_SUBST(ENABLE_STRIP)
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -170,16 +170,23 @@ public class AppConstants {
 
     public static final boolean MOZ_ANDROID_READING_LIST_SERVICE =
 //#ifdef MOZ_ANDROID_READING_LIST_SERVICE
     true;
 //#else
     false;
 //#endif
 
+    public static final boolean MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES =
+//#ifdef MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES
+    true;
+//#else
+    false;
+//#endif
+
     public static final boolean MOZ_TELEMETRY_ON_BY_DEFAULT =
 //#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
     true;
 //#else
     false;
 //#endif
 
     public static final boolean MOZ_ANDROID_TAB_QUEUE =
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -739,17 +739,17 @@ ANDROID_GENERATED_RESFILES += [
 ]
 
 # We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN 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_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
-            'MOZ_ANDROID_TAB_QUEUE'):
+            'MOZ_ANDROID_TAB_QUEUE', 'MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
 for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
 for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH',
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -102,16 +102,21 @@ MOZ_ANDROID_DOWNLOADS_INTEGRATION=1
 # Enable Tab Queue
 if test "$NIGHTLY_BUILD"; then
   MOZ_ANDROID_TAB_QUEUE=1
 fi
 
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
 
+# Enable FxAccount Avatar
+if test "$NIGHTLY_BUILD"; then
+  MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=1
+fi
+
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
 if test "$MOZ_OFFICIAL_BRANDING"; then
   if test "$MOZ_UPDATE_CHANNEL" = "beta" -o \
           "$MOZ_UPDATE_CHANNEL" = "release"; then
     MOZ_REQUIRE_SIGNING=1
   fi
 fi