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@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

View File

@@ -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',
],

View File

@@ -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',

View File

@@ -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',

View File

@@ -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',