Index: third_party/opus/opus.gyp |
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp |
index 3b37f42b795afd53725485d7f70ac96d51dd4d70..3a5af6da0d6cfef20ed78712ae73134429b057e9 100644 |
--- a/third_party/opus/opus.gyp |
+++ b/third_party/opus/opus.gyp |
@@ -5,11 +5,14 @@ |
{ |
'variables': { |
'conditions': [ |
- ['((OS=="android" or chromeos==1) and target_arch=="arm") or (OS=="ios" and target_arch=="armv7")', { |
+ ['((OS=="android" or chromeos==1) and (target_arch=="arm" or target_arch=="arm64")) or (OS=="ios" and target_arch=="armv7")', { |
Sergey Ulanov
2014/06/04 02:47:24
Can this be simply 'target_arch=="arm" or target_a
Solis
2014/06/04 15:04:04
l.776, l.845 of build/common.gypi mentions linux b
|
'use_opus_fixed_point%': 1, |
- 'use_opus_arm_optimization%': 1, |
}, { |
'use_opus_fixed_point%': 0, |
+ }], |
+ ['((OS=="android" or chromeos==1) and target_arch=="arm") or (OS=="ios" and target_arch=="armv7")', { |
+ 'use_opus_arm_optimization%': 1, |
+ }, { |
'use_opus_arm_optimization%': 0, |
}], |
['(OS=="android" or chromeos==1) and target_arch=="arm"', { |
@@ -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=="arm64")', { |
+ 'cflags!': ['-Os'], |
+ 'cflags': ['-O3'], |
Sergey Ulanov
2014/06/04 02:47:24
You can set release_optimize=3 instead of adding f
Solis
2014/06/04 15:04:04
Setting release_optimize in ffmpeg.gyp doesn't app
Sergey Ulanov
2014/06/04 17:55:55
You need to set it in this file, not if ffmpeg.gyp
Solis
2014/06/04 19:55:43
As discussed over chat, there was a bug in common.
|
+ }], |
['use_opus_fixed_point==0', { |
'include_dirs': [ |
'src/silk/float', |