Bug 1021864 - Part 2: Add build feature flag MOZ_ANDROID_SEARCH_ACTIVITY. r=rnewman

configure.in

@@ -3920,6 +3920,7 @@ MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_ANDROID_BEAM=
 MOZ_LOCALE_SWITCHER=
+MOZ_ANDROID_SEARCH_ACTIVITY=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_PAY=
@@ -4943,6 +4944,13 @@ 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 = Enable IPDL's "expensive" unit tests
 dnl ========================================================
@@ -8471,6 +8479,7 @@ AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
 AC_SUBST(MOZ_LOCALE_SWITCHER)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
+AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)

mobile/android/base/moz.build

@@ -527,7 +527,8 @@ ANDROID_GENERATED_RESFILES += [
     'res/values/strings.xml',
 ]
 
-for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG'):
+for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
+            'MOZ_ANDROID_SEARCH_ACTIVITY'):
     if CONFIG[var]:
         DEFINES[var] = 1
 

mobile/android/confvars.sh

@@ -74,3 +74,6 @@ MOZ_DEVICES=1
 
 # Enable second screen using native Android libraries
 MOZ_NATIVE_DEVICES=
+
+# Enable the Search Activity.
+MOZ_ANDROID_SEARCH_ACTIVITY=1