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

MozReview-Commit-ID: EPhThmQjKXF

build/moz.configure/old.configure

@@ -158,7 +158,6 @@ def old_configure_options(*options):
     '--enable-accessibility',
     '--enable-address-sanitizer',
     '--enable-alsa',
-    '--enable-android-apz',
     '--enable-android-omx',
     '--enable-android-resource-constrained',
     '--enable-approximate-location',

mobile/android/confvars.sh

@@ -74,8 +74,5 @@ MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
 
-# Enable C++ APZ.
-MOZ_ANDROID_APZ=1
-
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1

mobile/android/moz.configure

@@ -44,6 +44,12 @@ env_flag('MOZ_SWITCHBOARD',
          help='Include Switchboard A/B framework on Android',
          default=True)
 
+env_flag('MOZ_ANDROID_APZ',
+         help='Enable the C++ async pan/zoom code instead of the Java version',
+         default=True,
+         set_as_define=True,
+         name='--enable-android-apz')
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':

old-configure.in

@@ -2723,7 +2723,6 @@ 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
@@ -3536,18 +3535,6 @@ if test -n "$MOZ_ANDROID_HISTORY"; then
     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 ========================================================
@@ -6756,7 +6743,6 @@ 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)