diff options
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', |