Index: build/gn_migration.gypi |
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi |
index 520188e90360ca3b3f1b43214a838e775fcd22c8..d7507ffbac6abff0e588ea6caa55c0c304d23b62 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', |
@@ -354,7 +357,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', |
@@ -373,6 +375,11 @@ |
'../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
], |
}], |
+ ['media_use_ffmpeg==1', { |
+ 'dependencies': [ |
xhwang
2015/11/02 18:11:51
nit: Use 2-space indentation.
Julien Isorce Samsung
2015/11/03 16:02:27
Acknowledged.
|
+ '../media/media.gyp:ffmpeg_regression_tests', |
+ ], |
+ }], |
['OS=="android" or OS=="linux"', { |
'dependencies': [ |
'../net/net.gyp:disk_cache_memory_test', |