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

MozReview-Commit-ID: blxsCpUK1m

mobile/android/bouncer/moz.build

@@ -14,7 +14,8 @@ for var in ('ANDROID_PACKAGE_NAME',
 
 for var in ('MOZ_ANDROID_GCM',
             'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
-            'MOZ_ANDROID_BEAM'):
+            'MOZ_ANDROID_BEAM',
+            'MOZ_ANDROID_SEARCH_ACTIVITY'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 

mobile/android/confvars.sh

@@ -68,9 +68,6 @@ fi
 # Mark as WebGL conformant
 MOZ_WEBGL_CONFORMANT=1
 
-# Enable the Search Activity.
-MOZ_ANDROID_SEARCH_ACTIVITY=1
-
 # Enable the Mozilla Location Service stumbler.
 MOZ_ANDROID_MLS_STUMBLER=1
 

mobile/android/moz.configure

@@ -25,6 +25,10 @@ env_flag('MOZ_ANDROID_BEAM',
          help='Enable NFC permission on Android',
          default=True)
 
+env_flag('MOZ_ANDROID_SEARCH_ACTIVITY',
+         help='Include Search Activity on Android',
+         default=True)
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':

old-configure.in

@@ -2745,7 +2745,6 @@ BUILD_CTYPES=1
 MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
-MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
@@ -3564,13 +3563,6 @@ if test -n "$MOZ_WEBSMS_BACKEND"; then
     AC_DEFINE(MOZ_WEBSMS_BACKEND)
 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
 dnl ========================================================
@@ -6811,7 +6803,6 @@ AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 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)