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

MozReview-Commit-ID: DrJSWZwaC5d

mobile/android/base/moz.build

@@ -933,7 +933,8 @@ if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']:
 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
 

mobile/android/bouncer/moz.build

@@ -13,7 +13,8 @@ for var in ('ANDROID_PACKAGE_NAME',
     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]
 

mobile/android/confvars.sh

@@ -27,9 +27,6 @@ MOZ_SAFE_BROWSING=1
 
 MOZ_NO_SMART_CARDS=1
 
-# Enable NFC permission
-MOZ_ANDROID_BEAM=1
-
 MOZ_XULRUNNER=
 
 MOZ_CAPTURE=1

mobile/android/moz.configure

@@ -19,7 +19,11 @@ env_flag('MOZ_ANDROID_GCM',
 
 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):

old-configure.in

@@ -2745,7 +2745,6 @@ 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=
@@ -3565,13 +3564,6 @@ 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 ========================================================
@@ -6817,7 +6809,6 @@ 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)