Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index f5e797b61fe5ea05cc3abeccf93be9587a92859d..faf6fa470f9982626be8b9d32ba0ab513b28047e 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -330,6 +330,8 @@ |
| 'base/media_switches.cc', |
| 'base/media_switches.h', |
| 'base/media_win.cc', |
| + 'base/mime_util.cc', |
| + 'base/mime_util.h', |
| 'base/moving_average.cc', |
| 'base/moving_average.h', |
| 'base/multi_channel_resampler.cc', |
| @@ -1036,7 +1038,7 @@ |
| 'formats/mpeg/mpeg_audio_stream_parser_base.h', |
| ], |
| }], |
| - ['target_arch=="ia32" or target_arch=="x64"', { |
| + ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', { |
|
ddorwin
2015/05/14 18:09:59
Why is this necessary if iOS doesn't use the media
servolk
2015/05/14 22:30:49
Strictly speaking this is unnecessary for this CL,
|
| 'dependencies': [ |
| 'media_asm', |
| 'media_sse2', |
| @@ -1137,6 +1139,7 @@ |
| 'base/key_systems_unittest.cc', |
| 'base/mac/video_frame_mac_unittests.cc', |
| 'base/media_file_checker_unittest.cc', |
| + 'base/mime_util_unittest.cc', |
| 'base/moving_average_unittest.cc', |
| 'base/multi_channel_resampler_unittest.cc', |
| 'base/null_video_sink_unittest.cc', |