Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1568455 - Detect Android NDK on Windows. r=nalexander

Browse Source 
Toolchain path for Windows version is `<NDK ROOT>/toolchains/llvm/prebuilt/windows-x86_64` etc, so it isn't '`winnt`.
So we has to replace `host.kernel.lower()` with `windows`.

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Makoto Kato 2019-07-26 15:54:07 +00:00
parent c21b40d483
commit 44c1524bcd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/moz.configure/android-ndk.configure
View File

@ -233,13 +233,14 @@ def android_toolchain(target, host, ndk, toolchain):
die('Target cpu is not supported.')
toolchain_format = '%s/toolchains/%s-4.9/prebuilt/%s-%s'
host_kernel = 'windows' if host.kernel == 'WINNT' else host.kernel.lower()
toolchain = toolchain_format % (ndk, target_base,
host.kernel.lower(), host.cpu)
host_kernel, host.cpu)
log.debug('Trying %s' % quote(toolchain))
if not isdir(toolchain) and host.cpu == 'x86_64':
toolchain = toolchain_format % (ndk, target_base,
host.kernel.lower(), 'x86')
host_kernel, 'x86')
log.debug('Trying %s' % quote(toolchain))
if isdir(toolchain):
return toolchain