Backed out changeset bc6c2b781953 (bug 1520402) for Linux build bustages on test_toolchain_configure. CLOSED TREE
authorCosmin Sabou <csabou@mozilla.com>
Thu, 17 Jan 2019 02:06:08 +0200
changeset 511292 e96f2ef974594bd4302b3d2d4cc00822ca2cca3e
parent 511291 939c78a89e7d29fda19d764e110bacca71f48e60
child 511293 9a00f3b44547afcdec22dc3d5bfe93e41c4ee843
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1520402
milestone66.0a1
backs outbc6c2b78195303f422558ef88788ebe0a18e7a19
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset bc6c2b781953 (bug 1520402) for Linux build bustages on test_toolchain_configure. CLOSED TREE
build/moz.configure/android-ndk.configure
build/moz.configure/toolchain.configure
--- a/build/moz.configure/android-ndk.configure
+++ b/build/moz.configure/android-ndk.configure
@@ -46,24 +46,25 @@ def android_version(value, min_version, 
             min_version, value[0])
 
     return version
 
 
 add_old_configure_assignment('android_version', android_version)
 
 
-@depends('--with-android-ndk', '--help')
-def ndk(value, help):
+@depends('--with-android-ndk', build_project, '--help')
+def ndk(value, build_project, help):
     if help:
         return
-    if not value:
+    if build_project == 'mobile/android' and not value:
         die('You must specify --with-android-ndk=/path/to/ndk when '
-            'building for Android')
-    return value[0]
+            'building mobile/android')
+    if value:
+        return value[0]
 
 
 set_config('ANDROID_NDK', ndk)
 add_old_configure_assignment('android_ndk', ndk)
 
 
 @depends(ndk)
 @checking('for android ndk version')
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -159,19 +159,19 @@ set_config('HAVE_NASM', have_nasm)
 set_config('HAVE_YASM', have_yasm)
 # Until the YASM variable is not necessary in old-configure.
 add_old_configure_assignment('YASM', have_yasm)
 
 # Android NDK
 # ==============================================================
 
 
-@depends('--disable-compile-environment', target)
-def compiling_android(compile_env, target):
-    return compile_env and target.os == 'Android'
+@depends('--disable-compile-environment', build_project)
+def compiling_android(compile_env, build_project):
+    return compile_env and build_project in ('mobile/android', 'js')
 
 
 include('android-ndk.configure', when=compiling_android)
 
 with only_when(target_is_osx):
     # MacOS deployment target version
     # ==============================================================
     # This needs to happen before any compilation test is done.