Bug 1257958 - Move MOZ_ANDROID_BEAM to Python configure. r=nalexander
authorChris Manchester <cmanchester@mozilla.com>
Fri, 22 Apr 2016 13:01:21 -0700
changeset 332468 7ad61e955e0f20b9a0dfda3f571b8ddcbf1d5b06
parent 332467 69c8a0dd4059b351e639dd52d3bdf361cf7bb4bb
child 332469 df22a122b132ecc40bc23253300e9e887d30d96f
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_BEAM to Python configure. r=nalexander MozReview-Commit-ID: DrJSWZwaC5d
mobile/android/base/moz.build
mobile/android/bouncer/moz.build
mobile/android/confvars.sh
mobile/android/moz.configure
old-configure.in
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -928,17 +928,18 @@ if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRE
         ]
 
 # 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', '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_GCM', 'MOZ_ANDROID_EXCLUDE_FONTS', 'MOZ_LOCALE_SWITCHER',
+            'MOZ_ANDROID_BEAM'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
 for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL', 'MOZ_ANDROID_GCM_SENDERID'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
 for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH',
--- a/mobile/android/bouncer/moz.build
+++ b/mobile/android/bouncer/moz.build
@@ -8,17 +8,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',
-            'MOZ_ANDROID_DOWNLOADS_INTEGRATION'):
+            'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
+            'MOZ_ANDROID_BEAM'):
     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
@@ -22,19 +22,16 @@ MOZ_ANDROID_MIN_SDK_VERSION=15
 MOZ_ANDROID_APPLICATION_CLASS=org.mozilla.gecko.GeckoApplication
 MOZ_ANDROID_BROWSER_INTENT_CLASS=org.mozilla.gecko.BrowserApp
 MOZ_ANDROID_SEARCH_INTENT_CLASS=org.mozilla.search.SearchActivity
 
 MOZ_SAFE_BROWSING=1
 
 MOZ_NO_SMART_CARDS=1
 
-# Enable NFC permission
-MOZ_ANDROID_BEAM=1
-
 MOZ_XULRUNNER=
 
 MOZ_CAPTURE=1
 MOZ_RAW=1
 MOZ_PLACES=
 MOZ_SOCIAL=
 MOZ_ANDROID_HISTORY=1
 
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -14,17 +14,21 @@ env_flag('MOZ_LOCALE_SWITCHER',
 
 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)
+         default=True)
+
+env_flag('MOZ_ANDROID_BEAM',
+         help='Enable NFC permission on Android',
+         default=True)
 
 @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 '
--- a/old-configure.in
+++ b/old-configure.in
@@ -2740,17 +2740,16 @@ NECKO_COOKIES=1
 NECKO_PROTOCOLS_DEFAULT="about app data file ftp http res viewsource websocket wyciwyg device"
 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_MLS_STUMBLER=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
 MOZ_SWITCHBOARD=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
@@ -3561,23 +3560,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 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
 dnl ========================================================
 if test -n "$MOZ_ANDROID_SEARCH_ACTIVITY"; then
     AC_DEFINE(MOZ_ANDROID_SEARCH_ACTIVITY)
 fi
 
 dnl ========================================================
 dnl = Include Mozilla Location Service Stumbler on Android
@@ -6812,17 +6804,16 @@ AC_SUBST(MOZ_HAS_WINSDK_WITH_D3D)
 AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL)
 AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL_PATH)
 AC_SUBST(MOZ_DIRECTX_SDK_PATH)
 AC_SUBST(MOZ_D3DCOMPILER_XP_DLL)
 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_APPLICATION_CLASS)
 AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)