Bug 1520402 - Require the android NDK when targetting Android, not when building Fennec. r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D16671

--HG--
extra : moz-landing-system : lando

build/moz.configure/android-ndk.configure

@@ -51,13 +51,12 @@ def android_version(value, min_version):
 add_old_configure_assignment('android_version', android_version)
 
 
-@depends('--with-android-ndk', build_project)
-def ndk(value, build_project):
-    if build_project == 'mobile/android' and not value:
+@depends('--with-android-ndk')
+def ndk(value):
+    if not value:
         die('You must specify --with-android-ndk=/path/to/ndk when '
-            'building mobile/android')
-    if value:
-        return value[0]
+            'building for Android')
+    return value[0]
 
 
 set_config('ANDROID_NDK', ndk)

build/moz.configure/toolchain.configure

@@ -164,9 +164,9 @@ add_old_configure_assignment('YASM', have_yasm)
 # ==============================================================
 
 
-@depends('--disable-compile-environment', build_project)
-def compiling_android(compile_env, build_project):
-    return compile_env and build_project in ('mobile/android', 'js')
+@depends('--disable-compile-environment', target)
+def compiling_android(compile_env, target):
+    return compile_env and target.os == 'Android'
 
 
 include('android-ndk.configure', when=compiling_android)