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

Change uses of the obsolete armv7 setting to arm_version==7.

Browse Source 
BUG=http://crbug.com/234135
R=andrew@webrtc.org, fischman@webrtc.org, kjellander@webrtc.org

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

Patch from Mostyn Bramley-Moore <mostynb@opera.com>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5250 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2013-12-10 09:26:07 +00:00
parent eb7def234e
commit 917306d3fd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/build/common.gypi
View File

@ -192,7 +192,7 @@
'WEBRTC_ARCH_ARM',
],
'conditions': [
['armv7==1', {
['arm_version==7', {
'defines': ['WEBRTC_ARCH_ARM_V7',],
'conditions': [
['arm_neon==1', {

4
webrtc/common_audio/common_audio.gyp
View File

@ -103,7 +103,7 @@
'signal_processing/spl_sqrt_floor.c',
],
'conditions': [
['armv7==1', {
['arm_version==7', {
'dependencies': ['common_audio_neon',],
'sources': [
'signal_processing/filter_ar_fast_q12_armv7.S',
@ -161,7 +161,7 @@
},
], # targets
}],
['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', {
['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', {
'targets': [
{
'target_name': 'common_audio_neon',

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

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

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

@ -117,7 +117,7 @@
['target_arch=="ia32" or target_arch=="x64"', {
'dependencies': ['audio_processing_sse2',],
}],
['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', {
['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', {
'dependencies': ['audio_processing_neon',],
}],
['target_arch=="mipsel"', {
@ -168,7 +168,7 @@
},
],
}],
['(target_arch=="arm" and armv7==1) or target_arch=="armv7"', {
['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', {
'targets': [{
'target_name': 'audio_processing_neon',
'type': 'static_library',