Index: third_party/opus/opus.gyp |
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp |
index e6c4bcf1b6650754bf901a22b820bde8e64c597c..84e1cb2a27d7e09d988bfec228e4f93b2c1a4270 100644 |
--- a/third_party/opus/opus.gyp |
+++ b/third_party/opus/opus.gyp |
@@ -5,17 +5,17 @@ |
{ |
'variables': { |
'conditions': [ |
- ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', { |
+ ['target_arch=="arm" or target_arch=="arm64"', { |
ajm
2014/10/08 06:19:53
This is broader than the corresponding BUILD.gn co
kjellander_chromium
2014/10/08 07:24:04
Yes, please update BUILD.gn if you want (can be do
ajm
2014/10/08 15:55:00
Done.
|
'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=="android" or chromeos==1)', { |
ajm
2014/10/08 06:19:53
This is what BUILD.gn uses, though technically it
kjellander_chromium
2014/10/08 07:24:04
GN and GYP should be the same, but I don't know en
tlegrand1
2014/10/08 09:03:27
This change is not correct, it is the BUILD.gn tha
ajm
2014/10/08 15:55:00
Done.
|
'use_opus_rtcd%': 1, |
}, { |
'use_opus_rtcd%': 0, |
@@ -76,7 +76,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'], |
}], |