Bug 1257958 - Move MOZ_ANDROID_DOWNLOADS_INTEGRATION to Python configure. r=nalexander
authorChris Manchester <cmanchester@mozilla.com>
Fri, 22 Apr 2016 13:01:21 -0700
changeset 332467 69c8a0dd4059b351e639dd52d3bdf361cf7bb4bb
parent 332466 755ad040785fd75084ff049b5f1184e5adf5befb
child 332468 7ad61e955e0f20b9a0dfda3f571b8ddcbf1d5b06
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1257958
milestone48.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 1257958 - Move MOZ_ANDROID_DOWNLOADS_INTEGRATION to Python configure. r=nalexander MozReview-Commit-ID: Alu8Qbtm4U3
mobile/android/bouncer/moz.build
mobile/android/confvars.sh
mobile/android/moz.configure
old-configure.in
--- a/mobile/android/bouncer/moz.build
+++ b/mobile/android/bouncer/moz.build
@@ -7,17 +7,18 @@
 DEFINES['ANDROID_VERSION_CODE'] = '1'
 
 for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_ANDROID_BROWSER_INTENT_CLASS',
             'MOZ_APP_DISPLAYNAME',
             'MOZ_APP_VERSION'):
     DEFINES[var] = CONFIG[var]
 
-for var in ('MOZ_ANDROID_GCM',):
+for var in ('MOZ_ANDROID_GCM',
+            'MOZ_ANDROID_DOWNLOADS_INTEGRATION'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
 ANDROID_APK_NAME = 'bouncer'
 ANDROID_APK_PACKAGE = CONFIG['ANDROID_PACKAGE_NAME']
 
 # Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -72,19 +72,16 @@ fi
 MOZ_WEBGL_CONFORMANT=1
 
 # Enable the Search Activity.
 MOZ_ANDROID_SEARCH_ACTIVITY=1
 
 # Enable the Mozilla Location Service stumbler.
 MOZ_ANDROID_MLS_STUMBLER=1
 
-# Enable adding to the system downloads list.
-MOZ_ANDROID_DOWNLOADS_INTEGRATION=1
-
 # Build and package the install bouncer APK by default.
 MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
 
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
 
 # Enable C++ APZ.
 MOZ_ANDROID_APZ=1
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -12,16 +12,20 @@ env_flag('MOZ_LOCALE_SWITCHER',
          help='Enable runtime locale switching',
          default=True)
 
 env_flag('MOZ_ANDROID_GCM',
          help='Enable GCM registration on Nightly builds only',
          default=enabled_in_nightly,
          set_for_old_configure=True)
 
+env_flag('MOZ_ANDROID_DOWNLOADS_INTEGRATION',
+         help='Enable system download manager on Android',
+         default=enabled_everywhere)
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':
         log.error('You must specify --target=arm-linux-androideabi (or some '
                   'other valid Android target) when building mobile/android.')
         die('See https://developer.mozilla.org/docs/Mozilla/Developer_guide/'
             'Build_Instructions/Simple_Firefox_for_Android_build '
             'for more information about the necessary options.')
--- a/old-configure.in
+++ b/old-configure.in
@@ -2742,17 +2742,16 @@ if test -n "$MOZ_RTSP"; then
   NECKO_PROTOCOLS_DEFAULT="$NECKO_PROTOCOLS_DEFAULT rtsp"
 fi
 BUILD_CTYPES=1
 MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_ANDROID_BEAM=
 MOZ_ANDROID_SEARCH_ACTIVITY=
-MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
 MOZ_SWITCHBOARD=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
 MOZ_PAY=
@@ -3562,23 +3561,16 @@ MOZ_ARG_DISABLE_BOOL(websms-backend,
     MOZ_WEBSMS_BACKEND=,
     MOZ_WEBSMS_BACKEND=1)
 
 if test -n "$MOZ_WEBSMS_BACKEND"; then
     AC_DEFINE(MOZ_WEBSMS_BACKEND)
 fi
 
 dnl ========================================================
-dnl = Enable system download manager on Android
-dnl ========================================================
-if test -n "$MOZ_ANDROID_DOWNLOADS_INTEGRATION"; then
-    AC_DEFINE(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
-fi
-
-dnl ========================================================
 dnl = Enable NFC permission on Android
 dnl ========================================================
 if test -n "$MOZ_ANDROID_BEAM"; then
     AC_DEFINE(MOZ_ANDROID_BEAM)
 fi
 
 dnl ========================================================
 dnl = Include Search Activity on Android
@@ -6826,17 +6818,16 @@ AC_SUBST(MOZ_D3DCOMPILER_XP_CAB)
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
 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_ANDROID_DOWNLOAD_CONTENT_SERVICE)
 AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 AC_SUBST(MOZ_INSTALL_TRACKING)
 AC_SUBST(MOZ_SWITCHBOARD)
 AC_SUBST(ENABLE_STRIP)