Bug 1257958 - Move MOZ_ANDROID_SEARCH_ACTIVITY to Python configure. r=nalexander
MozReview-Commit-ID: blxsCpUK1m
--- a/mobile/android/bouncer/moz.build
+++ b/mobile/android/bouncer/moz.build
@@ -9,17 +9,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_BEAM'):
+ 'MOZ_ANDROID_BEAM',
+ 'MOZ_ANDROID_SEARCH_ACTIVITY'):
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
@@ -63,19 +63,16 @@ if test "$RELEASE_BUILD"; then
if test "$MOZ_NATIVE_DEVICES"; then
MOZ_INSTALL_TRACKING=1
fi
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
# Build and package the install bouncer APK by default.
MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
# Use the low-memory GC tuning.
export JS_GC_SMALL_CHUNK_SIZE=1
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -20,16 +20,20 @@ env_flag('MOZ_ANDROID_GCM',
env_flag('MOZ_ANDROID_DOWNLOADS_INTEGRATION',
help='Enable system download manager on Android',
default=True)
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':
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 '
'for more information about the necessary options.')
--- 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_SEARCH_ACTIVITY=
MOZ_ANDROID_MLS_STUMBLER=
MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
MOZ_INSTALL_TRACKING=
MOZ_SWITCHBOARD=
ACCESSIBILITY=1
MOZ_TIME_MANAGER=
MOZ_SIMPLEPUSH=
MOZ_PAY=
@@ -3560,23 +3559,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 = 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 ========================================================
if test -n "$MOZ_ANDROID_MLS_STUMBLER"; then
AC_DEFINE(MOZ_ANDROID_MLS_STUMBLER)
fi
dnl =========================================================
dnl = Whether to exclude hyphenations files in the build
@@ -6806,17 +6798,16 @@ 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_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)
AC_SUBST(MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE)
AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
AC_SUBST(MOZ_INSTALL_TRACKING)