generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Recognize armv7 target_arch for ios support in webrtc common.gyp

Browse Source 
BUG=2343
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2176004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4684 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org
2013-09-05 16:46:36 +00:00
parent be588f9a58
commit 31b4a5ac82
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/build/common.gypi
View File

@@ -141,7 +141,7 @@
'enable_protobuf%': 0, 'enable_protobuf%': 0,
'include_tests%': 0, 'include_tests%': 0,
}], }],
['target_arch=="arm"', { ['target_arch=="arm" or target_arch=="armv7"', {
'prefer_fixed_point%': 1, 'prefer_fixed_point%': 1,
}], }],
], # conditions ], # conditions
@@ -195,7 +195,7 @@
}], }],
], ],
}], }],
['target_arch=="arm"', { ['target_arch=="arm" or target_arch=="armv7"', {
'defines': [ 'defines': [
'WEBRTC_ARCH_ARM', 'WEBRTC_ARCH_ARM',
], ],

4
webrtc/common_audio/common_audio.gyp
View File

@@ -93,7 +93,7 @@
['target_arch=="ia32" or target_arch=="x64"', { ['target_arch=="ia32" or target_arch=="x64"', {
'dependencies': ['common_audio_sse2',], 'dependencies': ['common_audio_sse2',],
}], }],
['target_arch=="arm"', { ['target_arch=="arm" or target_arch=="armv7"', {
'sources': [ 'sources': [
'signal_processing/complex_bit_reverse_arm.S', 'signal_processing/complex_bit_reverse_arm.S',
'signal_processing/spl_sqrt_floor_arm.S', 'signal_processing/spl_sqrt_floor_arm.S',
@@ -150,7 +150,7 @@
}, },
], # targets ], # targets
}], }],
['target_arch=="arm" and armv7==1', { ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', {
'targets': [ 'targets': [
{ {
'target_name': 'common_audio_neon', 'target_name': 'common_audio_neon',

4
webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
View File

@@ -72,7 +72,7 @@
'WEBRTC_LINUX', 'WEBRTC_LINUX',
], ],
}], }],
['target_arch=="arm" and armv7==1', { ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', {
'dependencies': [ 'isac_neon', ], 'dependencies': [ 'isac_neon', ],
'sources': [ 'sources': [
'lattice_armv7.S', 'lattice_armv7.S',
@@ -87,7 +87,7 @@
}, },
], ],
'conditions': [ 'conditions': [
['target_arch=="arm" and armv7==1', { ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', {
'targets': [ 'targets': [
{ {
'target_name': 'isac_neon', 'target_name': 'isac_neon',

4
webrtc/modules/audio_processing/audio_processing.gypi
View File

@@ -119,7 +119,7 @@
['target_arch=="ia32" or target_arch=="x64"', { ['target_arch=="ia32" or target_arch=="x64"', {
'dependencies': ['audio_processing_sse2',], 'dependencies': ['audio_processing_sse2',],
}], }],
['target_arch=="arm" and armv7==1', { ['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', {
'dependencies': ['audio_processing_neon',], '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': [{ 'targets': [{
'target_name': 'audio_processing_neon', 'target_name': 'audio_processing_neon',
'type': 'static_library', 'type': 'static_library',