Index: third_party/qcms/qcms.gyp |
diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp |
index aeee4e6cba8fd118730d43f8c684afbbe46b0da6..6f6543c3f3e2f5b087daf61d6190973f59486d6d 100644 |
--- a/third_party/qcms/qcms.gyp |
+++ b/third_party/qcms/qcms.gyp |
@@ -3,19 +3,6 @@ |
# found in the LICENSE file. |
{ |
- 'variables': { |
- 'conditions': [ |
- # For ARM, turn off SSE2. |
- # For x86, turn off SSE2 for non-CrOS *nix Chrome builds. |
- ['disable_sse2==1 or target_arch=="arm" or \ |
- (branding=="Chrome" and target_arch=="ia32" and \ |
- os_posix==1 and OS!="mac" and chromeos==0)', { |
- 'qcms_use_sse': 0, |
- }, { |
- 'qcms_use_sse': 1, |
- }], |
- ], |
- }, |
'targets': [ |
{ |
'target_name': 'qcms', |
@@ -42,6 +29,20 @@ |
# Warning (sign-conversion) fixed upstream by large refactoring. Can be |
# removed on next roll. |
'msvs_disabled_warnings': [ 4018 ], |
+ |
+ 'variables': { |
+ 'conditions': [ |
+ # For x86, turn off SSE2 for non-CrOS *nix Chrome builds. |
+ ['disable_sse2==1 or \ |
+ (branding=="Chrome" and target_arch=="ia32" and \ |
+ os_posix==1 and OS!="mac" and chromeos==0)', { |
+ 'qcms_use_sse': 0, |
+ }, { |
+ 'qcms_use_sse': 1, |
+ }], |
+ ], |
+ }, |
+ |
'conditions': [ |
[ 'qcms_use_sse==1', { |
'defines': [ |