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

Unified Diff: media/media_options.gni

Issue 474693002: Changes to media.gyp for Chromoting iOS client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update gn as well Created 6 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 | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media_options.gni
diff --git a/media/media_options.gni b/media/media_options.gni
index 23decabcf905e0a0c327ac0daa1184debf2dd472..33bcba02d81ef9a48811175c82412754fd57d8bf 100644
--- a/media/media_options.gni
+++ b/media/media_options.gni
@@ -17,8 +17,8 @@ linux_link_pulseaudio = false
# TODO(ajwong): Enable libvpx once that's converted.
media_use_ffmpeg = true
media_use_libvpx = false
-if (is_android) {
- # Android doesn't use ffmpeg or libvpx.
+if (is_android || is_ios) {
+ # Android and iOS don't use ffmpeg or libvpx.
media_use_ffmpeg = false
media_use_libvpx = false
}
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698