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

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: Another go at gyp files Created 7 years, 3 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
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f62174e0bc4220c3afc3e3b435768880b5e3c01e..87e704adcc494657cfd424386765b95b0972653f 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1288,9 +1288,17 @@
['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==0', {
+ }, { # android_webview_build!=0
+ 'defines': ['AVOID_LIBYUV_FOR_ANDROID_WEBVIEW'],
wjia(left Chromium) 2013/09/26 20:31:35 This won't work, considering how you use AVOID_LIB
mcasas 2013/09/27 08:32:36 Yes but iOS builds do not compile anything related
+ }],
['enable_webrtc==1', {
'dependencies': [
'../jingle/jingle.gyp:jingle_glue',

Powered by Google App Engine
This is Rietveld 408576698