From 14146e40aaafadbd7fb99ea9e45f528624f71538 Mon Sep 17 00:00:00 2001 From: "tkchin@webrtc.org" Date: Fri, 31 Oct 2014 00:14:39 +0000 Subject: [PATCH] arm64 iOS build. Allows successful build of arm64 libraries using GYP_DEFINES="OS=ios target_arch=arm64 target_subarch=arm64". Note that not all libraries will be NEON optimized (eg common_audio), however most importantly libvpx will be. WEBRTC_ARCH_ARM needs to be defined so that libvpx doesn't post-process, which is significantly detrimental to performance. BUG=3898 R=kjellander@webrtc.org, pthatcher@webrtc.org Review URL: https://webrtc-codereview.appspot.com/26959004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7573 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/base/mediachannel.h | 2 +- webrtc/BUILD.gn | 4 ++++ webrtc/build/common.gypi | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h index dda9d1f4b..5e03ef91d 100644 --- a/talk/media/base/mediachannel.h +++ b/talk/media/base/mediachannel.h @@ -971,7 +971,7 @@ struct BandwidthEstimationInfo { // StatsOptions::include_received_propagation_stats is true. int total_received_propagation_delta_ms; std::vector recent_received_propagation_delta_ms; - std::vector recent_received_packet_group_arrival_time_ms; + std::vector recent_received_packet_group_arrival_time_ms; }; struct VoiceMediaInfo { diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 9d2fa6a0c..157be6f9a 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -120,6 +120,10 @@ config("common_config") { } } + if (cpu_arch == "arm64") { + defines += [ "WEBRTC_ARCH_ARM" ] + } + if (cpu_arch == "arm") { defines += [ "WEBRTC_ARCH_ARM" ] if (arm_version == 7) { diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 18b33830d..33dbace9b 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -250,6 +250,11 @@ }], ], }], + ['target_arch=="arm64"', { + 'defines': [ + 'WEBRTC_ARCH_ARM', + ], + }], ['target_arch=="arm" or target_arch=="armv7"', { 'defines': [ 'WEBRTC_ARCH_ARM',