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

Unified Diff: content/content_browser.gypi

Issue 23444072: Use libyuv in Android VideoCaptureController (not for Android WebView) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed content_browser gyp define. Created 7 years, 2 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 | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 7835950f4b962537125aaf5f97bc72546ae03bff..e578908b3bb082480e73b34674f17d3e8655fd73 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1287,9 +1287,16 @@
['OS!="android" and OS!="ios"', {
'dependencies': [
'browser/tracing/tracing_resources.gyp:tracing_resources',
+ ],
+ }],
+ ['android_webview_build==0 and OS!="ios"', {
+ 'dependencies': [
'../third_party/libyuv/libyuv.gyp:libyuv',
],
}],
+ ['android_webview_build==1', {
+ 'defines': ['AVOID_LIBYUV_FOR_ANDROID_WEBVIEW'],
+ }],
['enable_webrtc==1', {
'dependencies': [
'../jingle/jingle.gyp:jingle_glue',
« no previous file with comments | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698