diff options
| author | mostynb <mostynb@opera.com> | 2015-08-20 10:22:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-20 17:22:44 +0000 |
| commit | 2196a4693837eee143be5f225236ed666bd31744 (patch) | |
| tree | e1f26d4e47e64e40746f89baf36e5b0510281a42 | |
| parent | a0399f4a3557eba55c6b9b85a14ef4a5d6dcd955 (diff) | |
| download | chromium_src-2196a4693837eee143be5f225236ed666bd31744.zip chromium_src-2196a4693837eee143be5f225236ed666bd31744.tar.gz chromium_src-2196a4693837eee143be5f225236ed666bd31744.tar.bz2 | |
make use of media_use_ffmpeg in BUILD.gn
Review URL: https://codereview.chromium.org/1297583004
Cr-Commit-Position: refs/heads/master@{#344525}
| -rw-r--r-- | BUILD.gn | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni") import("//build/config/features.gni") import("//build/config/ui.gni") import("//build/module_args/v8.gni") +import("//media/media_options.gni") if (is_android) { import("//build/config/android/config.gni") @@ -390,7 +391,6 @@ group("both_gn_and_gyp") { "//gpu:gpu_perftests", "//gpu:gl_tests", "//ipc:ipc_perftests", - "//media:ffmpeg_regression_tests", # TODO(GYP) this should be conditional on media_use_ffmpeg "//media:media_perftests", "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", @@ -426,6 +426,10 @@ group("both_gn_and_gyp") { deps += [ "//remoting:remoting_key_tester" ] } + if (media_use_ffmpeg) { + deps += [ "//media:ffmpeg_regression_tests" ] + } + if (use_ash) { deps += [ "//ash:ash_shell", |