Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 526c089fc69df20cf92a165a63d0a70167cfb670..0b369ea85195a687b69700fb87db5eea23e8831f 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -683,7 +683,7 @@ |
'message': 'Generating Pulse stubs for dynamic loading.', |
}, |
], |
- 'conditions': [ |
+ 'conditions': [ |
# Linux/Solaris need libdl for dlopen() and friends. |
['OS == "linux" or OS == "solaris"', { |
'link_settings': { |
@@ -811,6 +811,12 @@ |
'../build/linux/system.gyp:gtk', |
], |
}], |
+ # ios check is necessary due to http://crbug.com/172682. |
+ ['OS != "ios" and (target_arch == "ia32" or target_arch == "x64")', { |
+ 'dependencies': [ |
+ 'media_sse', |
+ ], |
+ }], |
], |
'target_conditions': [ |
['OS == "ios"', { |
@@ -1018,12 +1024,15 @@ |
'audio/audio_low_latency_input_output_unittest.cc', |
], |
}], |
- [ 'target_arch=="ia32" or target_arch=="x64"', { |
+ ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', { |
'sources': [ |
'base/simd/convert_rgb_to_yuv_unittest.cc', |
], |
+ 'dependencies': [ |
+ 'media_sse', |
+ ], |
}], |
- [ 'screen_capture_supported == 0', { |
+ ['screen_capture_supported == 0', { |
'sources/': [ |
['exclude', '^video/capture/screen/'], |
], |
@@ -1610,5 +1619,27 @@ |
}, # end of target differ_block_sse2 |
], |
}], |
+ # ios check is necessary due to http://crbug.com/172682. |
+ ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', { |
+ 'targets': [ |
+ { |
+ 'target_name': 'media_sse', |
+ 'type': 'static_library', |
+ 'cflags': [ |
+ '-msse', |
+ ], |
+ 'include_dirs': [ |
+ '..', |
+ ], |
+ 'defines': [ |
+ 'MEDIA_IMPLEMENTATION', |
+ ], |
+ 'sources': [ |
+ 'base/simd/sinc_resampler_sse.cc', |
+ 'base/simd/vector_math_sse.cc', |
+ ], |
+ }, # end of target media_sse |
+ ], |
+ }], |
], |
} |