Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: BUILD.gn

Issue 1297583004: make use of media_use_ffmpeg in BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index c320c0fdac6231dcb241938db5c1a279f05f068a..73cade2c0bfc02b4ae01931e85c3e42ff21f0647 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -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",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698