mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 02:14:43 +00:00
Bug 1310956 - Use arm64 for target_arch into GYP. r=glandium
Google's projects using GYP use arm64 for target_arch instead of aarch64. So we should use it for moz.build generator. MozReview-Commit-ID: J4SLKhCqyUo --HG-- extra : rebase_source : c902736ba0248eb5a3dfe94c174cb96374ebb94c extra : histedit_source : 52620e73d6457078b28402dc6ef33f78f1c5425d
This commit is contained in:
parent
3be8181e70
commit
0a7933f196
@ -109,6 +109,7 @@ gyp_vars['OS'] = flavors.get(os)
|
||||
arches = {
|
||||
'x86_64': 'x64',
|
||||
'x86': 'ia32',
|
||||
'aarch64': 'arm64',
|
||||
}
|
||||
|
||||
gyp_vars['target_arch'] = arches.get(CONFIG['CPU_ARCH'], CONFIG['CPU_ARCH'])
|
||||
|
@ -1027,7 +1027,7 @@
|
||||
}],
|
||||
],
|
||||
}],
|
||||
['target_arch=="aarch64"', {
|
||||
['target_arch=="arm64"', {
|
||||
'android_app_abi%': 'arm64-v8a',
|
||||
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-arm64',
|
||||
}],
|
||||
|
Loading…
Reference in New Issue
Block a user