Chromium Code Reviews| Index: third_party/opus/opus.gyp |
| diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp |
| index bc25921ae80d8427d8c76556187226654fc2dbb5..5435a5ec30b49ffecbe64c1184d31c360225e669 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"', { |
| '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"', { |
| + ['target_arch=="arm" and (OS=="win" or OS=="android" or desktop_linux==1 or chromeos==1)', { |
|
brettw
2014/10/25 15:58:06
replace the desktop_linux/chromeos thing with
OS
ajm
2014/10/26 18:20:31
Thanks, I wasn't sure whether OS=="linux" in the c
|
| + # Based on the conditions in celt/arm/armcpu.c: |
| + # defined(_MSC_VER) || defined(__linux__). |
| 'use_opus_rtcd%': 1, |
| }, { |
| 'use_opus_rtcd%': 0, |
| @@ -81,7 +83,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'], |
|
ajm
2014/10/24 19:57:29
Here's the gyp equivalent.
|
| 'cflags': ['-O3'], |
| }], |