Bug 1278959 - Move MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER to Python configure and make is settable by mozconfig. r=glandium
MozReview-Commit-ID: Hoo4vaIrRHq
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -54,16 +54,13 @@ 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
-# 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
# Enable checking that add-ons are signed by the trusted root
MOZ_ADDON_SIGNING=1
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -47,16 +47,23 @@ project_flag('MOZ_SWITCHBOARD',
option('--disable-android-apz', env='MOZ_ANDROID_APZ',
help='Disable the C++ async pan/zoom code and use the Java version instead')
android_apz = depends_if('--disable-android-apz')(lambda _: True)
set_config('MOZ_ANDROID_APZ', android_apz)
set_define('MOZ_ANDROID_APZ', android_apz)
+option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
+ help='Build and package the install bouncer APK',
+ default=True)
+
+set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
+ depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True))
+
imply_option('MOZ_SOCIAL', False)
imply_option('MOZ_SERVICES_HEALTHREPORT', True)
imply_option('MOZ_ANDROID_HISTORY', True)
set_config('ANDROID_SUPPORT_LIBRARY_VERSION', '23.0.1')
add_old_configure_assignment('ANDROID_SUPPORT_LIBRARY_VERSION', '23.0.1')
set_config('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0')
--- a/old-configure.in
+++ b/old-configure.in
@@ -6496,17 +6496,16 @@ 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_WEBSMS_BACKEND)
AC_SUBST(MOZ_DISABLE_GECKOVIEW)
AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
-AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
AC_SUBST(MOZ_INSTALL_TRACKING)
AC_SUBST(ENABLE_STRIP)
AC_SUBST(PKG_SKIP_STRIP)
AC_SUBST(STRIP_FLAGS)