Bug 1257326 - Treat MOZ_ANDROID_APZ as a regular option rather than a flag. draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 09 May 2016 15:20:16 -0700
changeset 365026 0606a59c04200f8aa27b0b89726a887dbc07bb12
parent 365025 885ec71eab3e8a243fc47fe28af04e70282195c2
child 365027 e7f76f5e1f4ae2fe5b7c28ea32ac4c7b306a985c
push id17617
push usercmanchester@mozilla.com
push dateMon, 09 May 2016 22:22:03 +0000
Bug 1257326 - Treat MOZ_ANDROID_APZ as a regular option rather than a flag. A subsequent commit will replace env_flag and make it impossible to pass --disable-android-apz, so this converts it to a reqular option for compatibility. MozReview-Commit-ID: HmP96AyU9ZM
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -39,21 +39,23 @@ env_flag('MOZ_ANDROID_DOWNLOAD_CONTENT_S
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
          help='Include Switchboard A/B framework on Android',
-         help='Enable the C++ async pan/zoom code instead of the Java version',
-         default=True,
-         set_as_define=True,
-         name='--enable-android-apz')
+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)
 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 '