Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1257958 - Move MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE to Python configure. r=nalexander

Browse Source 
MozReview-Commit-ID: 3ijJ6b7hxPf
This commit is contained in:
Chris Manchester 2016-04-22 13:01:22 -07:00
parent d3e163bb6c
commit 04dce3d8f2
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/moz.build
View File

@ -934,7 +934,7 @@ for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZ_DEBUG',
'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
'MOZ_ANDROID_GCM', 'MOZ_ANDROID_EXCLUDE_FONTS', 'MOZ_LOCALE_SWITCHER',
'MOZ_ANDROID_BEAM'):
'MOZ_ANDROID_BEAM', 'MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE'):
if CONFIG[var]:
DEFINES[var] = 1

3
mobile/android/confvars.sh
View File

@ -84,6 +84,3 @@ MOZ_ADDON_SIGNING=1
# Note: The framework is always included in the app. This flag controls
# usage of the framework.
MOZ_SWITCHBOARD=1
# Enable DLC background service and stop shipping fonts in the APK
MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE=1

4
mobile/android/moz.configure
View File

@ -33,6 +33,10 @@ env_flag('MOZ_ANDROID_MLS_STUMBLER',
help='Include Mozilla Location Service Stumbler on Android',
default=True)
env_flag('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
help='Background service for downloading additional content at runtime',
default=True)
@depends(target)
def check_target(target):
if target.os != 'Android':

8
old-configure.in
View File

@ -3569,13 +3569,6 @@ if test -n "$MOZ_EXCLUDE_HYPHENATION_DICTIONARIES"; then
AC_DEFINE(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
fi
dnl =========================================================
dnl = Background service for downloading additional content at runtime.
dnl =========================================================
if test -n "$MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE"; then
AC_DEFINE(MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE)
fi
dnl ========================================================
dnl = Include install tracking on Android
dnl ========================================================
@ -6799,7 +6792,6 @@ AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
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)