diff options
| author | mostynb <mostynb@opera.com> | 2015-01-07 14:02:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-07 22:03:21 +0000 |
| commit | 10406b9bcce7a8cb744a7ba118b11450444afb16 (patch) | |
| tree | 40130fff310b575528fc8a68e6e593655b74f8c5 /media/media.gyp | |
| parent | a759da6bd5af99f8d7c8596ddde0479a2c3480b1 (diff) | |
| download | chromium_src-10406b9bcce7a8cb744a7ba118b11450444afb16.zip chromium_src-10406b9bcce7a8cb744a7ba118b11450444afb16.tar.gz chromium_src-10406b9bcce7a8cb744a7ba118b11450444afb16.tar.bz2 | |
fix builds with vpx and/or ffmpeg disabled
If media_use_libvpx==0 then we should not include any libvpx headers.
And similarly for ffmpeg.
Followup to https://codereview.chromium.org/783003002
BUG=416570
Review URL: https://codereview.chromium.org/839763002
Cr-Commit-Position: refs/heads/master@{#310383}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 72263d7..afb6ec7 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -645,12 +645,23 @@ 'filters/in_memory_url_protocol.cc', 'filters/in_memory_url_protocol.h', ], + 'defines': [ + 'MEDIA_DISABLE_FFMPEG', + ], + 'direct_dependent_settings': { + 'defines': [ + 'MEDIA_DISABLE_FFMPEG', + ], + }, }], ['media_use_libvpx==1', { 'dependencies': [ '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', ], }, { # media_use_libvpx==0 + 'defines': [ + 'MEDIA_DISABLE_LIBVPX', + ], 'direct_dependent_settings': { 'defines': [ 'MEDIA_DISABLE_LIBVPX', |