Bug 1310956 - Use arm64 for target_arch into GYP. r=glandium
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 21 Oct 2016 14:48:24 +0900
changeset 347237 38b8e489b7f22ebd7b2e4cac6407041d47a07eef
parent 347236 822b14b07c0dedb8635b351cd401831b37727075
child 347238 e36f864a05312ee102f1409121af8acaaedecba3
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1310956
milestone52.0a1
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
build/gyp.mozbuild
media/webrtc/trunk/build/common.gypi
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -104,16 +104,17 @@ flavors = {
     'NetBSD': 'netbsd',
     'OpenBSD': 'openbsd',
 }
 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'])
 
 if CONFIG['ARM_ARCH']:
     if int(CONFIG['ARM_ARCH']) < 7:
         gyp_vars['armv7'] = 0
         gyp_vars['arm_neon_optional'] = 0
--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -1022,17 +1022,17 @@
                 'conditions': [
                   ['armv7==0', {
                     'android_app_abi%': 'armeabi',
                   }, {
                     'android_app_abi%': 'armeabi-v7a',
                   }],
                 ],
               }],
-              ['target_arch=="aarch64"', {
+              ['target_arch=="arm64"', {
                 'android_app_abi%': 'arm64-v8a',
                 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-arm64',
               }],
             ],
           },
           'android_ndk_root%': '<(android_ndk_root)',
           'android_app_abi%': '<(android_app_abi)',
           'android_ndk_sysroot%': '<(android_ndk_sysroot)',