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

Bug 1712245 - Use x86_64 NDK on Apple Slicon if native NDK is missing. r=firefox-build-system-reviewers,glandium

Browse Source 
Actually, Google doesn't release native version of NDK for macOS/aarch64.
So if missing, we use x86_64 NDK instead.

Differential Revision: https://phabricator.services.mozilla.com/D115675
This commit is contained in:
Makoto Kato 2021-05-26 01:37:37 +00:00
parent 254db9612f
commit 950eda2e59
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,9 @@ def android_toolchain(target, host, ndk, toolchain):
if not isdir(toolchain) and host.cpu == "x86_64":
toolchain = toolchain_format % (ndk, target_base, host_kernel, "x86")
log.debug("Trying %s" % quote(toolchain))
if not isdir(toolchain) and host.kernel == "Darwin" and host.cpu == "aarch64":
toolchain = toolchain_format % (ndk, target_base, host_kernel, "x86_64")
log.debug("Trying %s" % quote(toolchain))
if isdir(toolchain):
return toolchain
die("You have to specify --with-android-toolchain=" "/path/to/ndk/toolchain.")
@ -269,6 +272,8 @@ def android_lldb_server(target, host, ndk, lldb):
host_kernel = "windows" if host.kernel == "WINNT" else host.kernel.lower()
clang_path = os.path.join(ndk, clang_format % (host_kernel, host.cpu))
if not isdir(clang_path) and host.kernel == "Darwin" and host.cpu == "aarch64":
clang_path = os.path.join(ndk, clang_format % (host_kernel, "x86_64"))
log.debug("Listing subdirectories of %s" % quote(clang_path))
clang_subdirs = [
x for x in listdir(clang_path) if isdir(os.path.join(clang_path, x))