diff options
| author | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-05 16:46:36 +0000 |
|---|---|---|
| committer | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-05 16:46:36 +0000 |
| commit | 6f458ed743852357e0e3a36dafc5b2007550ee28 (patch) | |
| tree | 16b0d77ba808506515fdede327a66df651c802de | |
| parent | 06eaa5465d57f416c14bb3a587ba4146290d6a58 (diff) | |
| download | webrtc-6f458ed743852357e0e3a36dafc5b2007550ee28.tar.gz | |
Recognize armv7 target_arch for ios support in webrtc common.gyp
BUG=2343
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2176004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4684 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | common_audio/common_audio.gyp | 4 | ||||
| -rw-r--r-- | modules/audio_coding/codecs/isac/fix/source/isacfix.gypi | 4 | ||||
| -rw-r--r-- | modules/audio_processing/audio_processing.gypi | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index baaf7dff..b425a7e4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -141,7 +141,7 @@ 'enable_protobuf%': 0, 'include_tests%': 0, }], - ['target_arch=="arm"', { + ['target_arch=="arm" or target_arch=="armv7"', { 'prefer_fixed_point%': 1, }], ], # conditions @@ -195,7 +195,7 @@ }], ], }], - ['target_arch=="arm"', { + ['target_arch=="arm" or target_arch=="armv7"', { 'defines': [ 'WEBRTC_ARCH_ARM', ], diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp index 7ddf22d5..acf8491e 100644 --- a/common_audio/common_audio.gyp +++ b/common_audio/common_audio.gyp @@ -93,7 +93,7 @@ ['target_arch=="ia32" or target_arch=="x64"', { 'dependencies': ['common_audio_sse2',], }], - ['target_arch=="arm"', { + ['target_arch=="arm" or target_arch=="armv7"', { 'sources': [ 'signal_processing/complex_bit_reverse_arm.S', 'signal_processing/spl_sqrt_floor_arm.S', @@ -150,7 +150,7 @@ }, ], # targets }], - ['target_arch=="arm" and armv7==1', { + ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', { 'targets': [ { 'target_name': 'common_audio_neon', diff --git a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi index 6c3c1702..fd7bf2e9 100644 --- a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi +++ b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi @@ -72,7 +72,7 @@ 'WEBRTC_LINUX', ], }], - ['target_arch=="arm" and armv7==1', { + ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', { 'dependencies': [ 'isac_neon', ], 'sources': [ 'lattice_armv7.S', @@ -87,7 +87,7 @@ }, ], 'conditions': [ - ['target_arch=="arm" and armv7==1', { + ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', { 'targets': [ { 'target_name': 'isac_neon', diff --git a/modules/audio_processing/audio_processing.gypi b/modules/audio_processing/audio_processing.gypi index 88941ea7..02ba74b3 100644 --- a/modules/audio_processing/audio_processing.gypi +++ b/modules/audio_processing/audio_processing.gypi @@ -119,7 +119,7 @@ ['target_arch=="ia32" or target_arch=="x64"', { 'dependencies': ['audio_processing_sse2',], }], - ['target_arch=="arm" and armv7==1', { + ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', { 'dependencies': ['audio_processing_neon',], }], ], @@ -161,7 +161,7 @@ }, ], }], - ['target_arch=="arm" and armv7==1', { + ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', { 'targets': [{ 'target_name': 'audio_processing_neon', 'type': 'static_library', |