Index: third_party/opus/opus.gyp |
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp |
index e6c4bcf1b6650754bf901a22b820bde8e64c597c..c68be5e1518c51b017c6505d67e6fdfa98b88ac8 100644 |
--- a/third_party/opus/opus.gyp |
+++ b/third_party/opus/opus.gyp |
@@ -5,17 +5,19 @@ |
{ |
'variables': { |
'conditions': [ |
- ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', { |
+ ['target_arch=="arm" or target_arch=="arm64"', { |
minyue
2014/10/09 07:49:53
Has armv7 become arm in the building system?
If s
ajm
2014/10/09 15:29:32
Yes, you now specify armv7 with target_arch=="arm"
|
'use_opus_fixed_point%': 1, |
}, { |
'use_opus_fixed_point%': 0, |
}], |
- ['target_arch=="arm" or target_arch=="armv7"', { |
+ ['target_arch=="arm"', { |
'use_opus_arm_optimization%': 1, |
}, { |
'use_opus_arm_optimization%': 0, |
}], |
- ['target_arch=="arm"', { |
minyue
2014/10/09 15:38:10
With deprecation of armv7, did iOS already end up
ajm
2014/10/09 15:42:41
In our standalone webrtc waterfall, we're still (i
|
+ ['target_arch=="arm" and (OS=="win" or OS=="android" or desktop_linux==1 or chromeos==1)', { |
+ # Based on the conditions in celt/arm/armcpu.c: |
+ # defined(_MSC_VER) || defined(__linux__). |
'use_opus_rtcd%': 1, |
}, { |
'use_opus_rtcd%': 0, |
@@ -76,7 +78,7 @@ |
], |
}, |
}], |
- ['os_posix==1 and (target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64")', { |
+ ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', { |
'cflags!': ['-Os'], |
'cflags': ['-O3'], |
}], |