Bug 1257958 - Move MOZ_ANDROID_APZ to Python configure.
And do not port the subst, because its value is not used.
MozReview-Commit-ID: EPhThmQjKXF
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -165,17 +165,16 @@ def old_configure_options(*options):
*options)
@old_configure_options(
'--cache-file',
'--enable-accessibility',
'--enable-address-sanitizer',
'--enable-alsa',
- '--enable-android-apz',
'--enable-android-omx',
'--enable-android-resource-constrained',
'--enable-approximate-location',
'--enable-b2g-bt',
'--enable-b2g-camera',
'--enable-b2g-ril',
'--enable-bundled-fonts',
'--enable-chrome-format',
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -92,21 +92,16 @@ MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
# Use the low-memory GC tuning.
export JS_GC_SMALL_CHUNK_SIZE=1
# Enable GCM registration on Nightly builds only.
if test "$NIGHTLY_BUILD"; then
MOZ_ANDROID_GCM=1
fi
-# Enable C++ APZ on Nightly builds only.
-if test "$NIGHTLY_BUILD"; then
- MOZ_ANDROID_APZ=1
-fi
-
# Enable checking that add-ons are signed by the trusted root
MOZ_ADDON_SIGNING=1
# Enable the Switchboard A/B framework code.
# Note: The framework is always included in the app. This flag controls
# usage of the framework.
MOZ_SWITCHBOARD=1
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -1,7 +1,16 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+option('--enable-android-apz',
+ help='Enable the C++ async pan/zoom code instead of the Java version')
+
+@depends('--enable-android-apz', milestone)
+def android_apz(value, milestone):
+ # Enable C++ APZ by default on Nightly builds.
+ if value or milestone.is_nightly:
+ set_define('MOZ_ANDROID_APZ', '1')
+
include('../../toolkit/moz.configure')
--- a/old-configure.in
+++ b/old-configure.in
@@ -2898,17 +2898,16 @@ MOZ_PERMISSIONS=1
MOZ_PLACES=1
MOZ_SOCIAL=1
MOZ_PREF_EXTENSIONS=1
MOZ_PROFILELOCKING=1
MOZ_REFLOW_PERF=
MOZ_SAFE_BROWSING=
MOZ_HELP_VIEWER=
MOZ_SPELLCHECK=1
-MOZ_ANDROID_APZ=
MOZ_TOOLKIT_SEARCH=1
MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1
MOZ_URL_CLASSIFIER=
MOZ_XUL=1
MOZ_ZIPWRITER=1
NS_PRINTING=1
if test "$MOZ_IOS"; then
@@ -3770,28 +3769,16 @@ if test -n "$MOZ_ANDROID_HISTORY"; then
if test -z "$MOZ_PLACES"; then
AC_DEFINE(MOZ_ANDROID_HISTORY)
else
AC_MSG_ERROR([Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.])
fi
fi
dnl ========================================================
-dnl = Enable the C++ async pan/zoom code instead of the Java version
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(android-apz,
-[ --enable-android-apz Switch to C++ pan/zoom code],
- MOZ_ANDROID_APZ=1,
- MOZ_ANDROID_APZ=)
-if test -n "$MOZ_ANDROID_APZ"; then
- dnl Do this if defined in confvars.sh
- AC_DEFINE(MOZ_ANDROID_APZ)
-fi
-
-dnl ========================================================
dnl = Disable WebSMS backend
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(websms-backend,
[ --disable-websms-backend
Disable WebSMS backend],
MOZ_WEBSMS_BACKEND=,
MOZ_WEBSMS_BACKEND=1)
@@ -7310,17 +7297,16 @@ AC_SUBST(JARSIGNER)
AC_SUBST(KEYTOOL)
AC_SUBST(MOZ_PROFILELOCKING)
AC_SUBST(ENABLE_TESTS)
AC_SUBST(MOZ_UNIVERSALCHARDET)
AC_SUBST(ACCESSIBILITY)
AC_SUBST(MOZ_SPELLCHECK)
-AC_SUBST(MOZ_ANDROID_APZ)
AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
AC_SUBST(MOZ_CRASHREPORTER)
AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
AC_SUBST(MOZ_CRASHREPORTER_UPLOAD_FULL_SYMBOLS)
AC_SUBST(MOZ_MAINTENANCE_SERVICE)
AC_SUBST(MOZ_STUB_INSTALLER)
AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
AC_SUBST(MOZ_ENABLE_SIGNMAR)