Index: third_party/opus/opus.gyp |
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp |
index 3b37f42b795afd53725485d7f70ac96d51dd4d70..be8cbd7ff49f3d98d22c6c58f608e9e00abb9dbe 100644 |
--- a/third_party/opus/opus.gyp |
+++ b/third_party/opus/opus.gyp |
@@ -5,14 +5,17 @@ |
{ |
'variables': { |
'conditions': [ |
- ['((OS=="android" or chromeos==1) and target_arch=="arm") or (OS=="ios" and target_arch=="armv7")', { |
+ ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', { |
'use_opus_fixed_point%': 1, |
- 'use_opus_arm_optimization%': 1, |
}, { |
'use_opus_fixed_point%': 0, |
+ }], |
+ ['target_arch=="arm" or target_arch=="armv7"', { |
+ 'use_opus_arm_optimization%': 1, |
+ }, { |
'use_opus_arm_optimization%': 0, |
}], |
- ['(OS=="android" or chromeos==1) and target_arch=="arm"', { |
+ ['target_arch=="arm"', { |
'use_opus_rtcd%': 1, |
}, { |
'use_opus_rtcd%': 0, |
@@ -55,7 +58,7 @@ |
4334, # Disable 32-bit shift warning in src/opus_encoder.c . |
], |
}], |
- [ 'os_posix==1 and OS!="android"', { |
+ ['os_posix==1 and OS!="android"', { |
# Suppress a warning given by opus_decoder.c that tells us |
# optimizations are turned off. |
'cflags': [ |
@@ -67,6 +70,10 @@ |
], |
}, |
}], |
+ ['os_posix==1 and (target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64")', { |
+ 'cflags!': ['-Os'], |
+ 'cflags': ['-O3'], |
+ }], |
['use_opus_fixed_point==0', { |
'include_dirs': [ |
'src/silk/float', |