Change uses of the obsolete armv7 setting to arm_version==7.
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
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index b5fa785..b96e00f 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -192,7 +192,7 @@
'WEBRTC_ARCH_ARM',
],
'conditions': [
- ['armv7==1', {
+ ['arm_version==7', {
'defines': ['WEBRTC_ARCH_ARM_V7',],
'conditions': [
['arm_neon==1', {
diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp
index da52673..fa0135e 100644
--- a/webrtc/common_audio/common_audio.gyp
+++ b/webrtc/common_audio/common_audio.gyp
@@ -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',
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
index ae0c18a..87c9860 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
@@ -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',
diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi
index 555bdc3..336b4ee 100644
--- a/webrtc/modules/audio_processing/audio_processing.gypi
+++ b/webrtc/modules/audio_processing/audio_processing.gypi
@@ -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',
