Index: content/content_browser.gypi |
diff --git a/content/content_browser.gypi b/content/content_browser.gypi |
index f62174e0bc4220c3afc3e3b435768880b5e3c01e..f4fcafb0729851202e6372473cbe1347ad36dc6d 100644 |
--- a/content/content_browser.gypi |
+++ b/content/content_browser.gypi |
@@ -1288,8 +1288,14 @@ |
['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 |
+ 'defines': ['AVOID_LIBYUV_FOR_ANDROID_WEBVIEW'], |
wjia(left Chromium)
2013/09/25 18:50:25
Considering the condition for this branch is 'andr
mcasas
2013/09/26 11:28:56
Done.
|
}], |
['enable_webrtc==1', { |
'dependencies': [ |