Bug 1051087 - Ensure NEON optimizations are used for libyuv and webrtc audio code. r=ted, a=sledru
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -101,17 +101,17 @@ if CONFIG['ARM_ARCH']:
gyp_vars['arm_neon_optional'] = 0
elif os == 'Android':
gyp_vars['armv7'] = 1
else:
# CPU detection for ARM works on Android only. armv7 always uses CPU
# detection, so we have to set armv7=0 for non-Android target
gyp_vars['armv7'] = 0
# For libyuv
- gyp_vars['arm_version'] = CONFIG['ARM_ARCH']
+ gyp_vars['arm_version'] = int(CONFIG['ARM_ARCH'])
# Don't try to compile ssse3/sse4.1 code if toolchain doesn't support
if CONFIG['INTEL_ARCHITECTURE']:
if not CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3'] or not CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSE4_1']:
gyp_vars['yuv_disable_asm'] = 1
if CONFIG['MACOS_SDK_DIR']:
gyp_vars['mac_sdk_path'] = CONFIG['MACOS_SDK_DIR']
--- a/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi
+++ b/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi
@@ -194,19 +194,20 @@
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
],
'sources': [
'aecm/aecm_core_neon.c',
'ns/nsx_core_neon.c',
],
'conditions': [
['OS=="android" or OS=="ios"', {
- 'dependencies': [
- '<(gen_core_neon_offsets_gyp):*',
- ],
+ # This also provokes it to try to invoke gypi's in libvpx
+ #'dependencies': [
+ # '<(gen_core_neon_offsets_gyp):*',
+ #],
#
# We disable the ASM source, because our gyp->Makefile translator
# does not support the build steps to get the asm offsets.
'sources!': [
'aecm/aecm_core_neon.S',
'ns/nsx_core_neon.S',
],
'include_dirs': [