diff options
| author | j.isorce <j.isorce@samsung.com> | 2015-11-16 09:14:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-16 17:15:04 +0000 |
| commit | f6778e65400fd7b4b9592523c1de811dcde1355a (patch) | |
| tree | f033ecd39a6ae6053534d09ebb9b1fb9921892c4 /build | |
| parent | 05f9d3fd9ce5aae3d34a57af739a58297221c946 (diff) | |
| download | chromium_src-f6778e65400fd7b4b9592523c1de811dcde1355a.zip chromium_src-f6778e65400fd7b4b9592523c1de811dcde1355a.tar.gz chromium_src-f6778e65400fd7b4b9592523c1de811dcde1355a.tar.bz2 | |
fix build when ffmpeg, libvpx and libwebm are disabled
Tested with all combinaisons of
GYP_DEFINES="media_use_ffmpeg=i media_use_libvpx=j media_use_libwebm=k"
with i,j,k in {0, 1}^3
Same with GN:
media_use_ffmpeg = i
media_use_libvpx = j
media_use_libwebm = k
with i,j,k in {false, true}^3
If disabled it shows a black rectangle on video tag as expected.
If only ffmpeg is disabled, it succeeds to play webm video encoded with vpx.
BUG=
R=reillyg@chromium.org, jochen@chromium.org, xhwang@chromium.org, raymes@chromium.org
TEST=GYP_DEFINES="media_use_ffmpeg=0 media_use_libvpx=0 media_use_libwebm=0"
Review URL: https://codereview.chromium.org/1415793003
Cr-Commit-Position: refs/heads/master@{#359855}
Diffstat (limited to 'build')
| -rw-r--r-- | build/gn_migration.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index a9555ab..279d4c4 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -19,6 +19,9 @@ # above contracts. { + 'includes': [ + '../media/media_variables.gypi' + ], 'targets': [ { 'target_name': 'gyp_all', @@ -360,7 +363,6 @@ '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test', # TODO(GYP) crbug.com/471920 '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_test', # TODO(GYP) crbug.com/471903 to make this complete. '../ipc/ipc.gyp:ipc_perftests', - '../media/media.gyp:ffmpeg_regression_tests', # TODO(GYP) this should be conditional on media_use_ffmpeg '../mojo/mojo_base.gyp:mojo_common_unittests', '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma', '../skia/skia.gyp:filter_fuzz_stub', @@ -379,6 +381,11 @@ '../ui/views/examples/examples.gyp:views_examples_with_content_exe', ], }], + ['media_use_ffmpeg==1', { + 'dependencies': [ + '../media/media.gyp:ffmpeg_regression_tests', + ], + }], ['OS=="android" or OS=="linux"', { 'dependencies': [ '../net/net.gyp:disk_cache_memory_test', |