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

Unified Diff: media/media.gyp

Issue 12334037: ffmpeg_unittests should depend on use_ffmpeg==1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 10 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: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 7485411b955dbe4c00cd55554c64c9d98e7e9dc2..76aef76304c7220b8c279f1ccaafa1dd1699120e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1392,9 +1392,7 @@
],
}],
- ['OS != "android" and OS != "ios"', {
- # Android and iOS do not use ffmpeg, so disable the targets which require
- # it.
+ ['use_ffmpeg == 1', {
'targets': [
{
'target_name': 'ffmpeg_unittests',
« 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