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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_common.gypi

Issue 381683003: Fix enable_webrtc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove content_tests when enable_webrtc = 1 Created 6 years, 5 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/common/content_message_generator.h ('k') | content/shell/renderer/test_runner/web_frame_test_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 6c3d71c7dd503754aff3a44971f2b9fc99daf1f5..7920caabfa2d74216e1209b61c9bc4f230a34720 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -11,7 +11,6 @@
'../skia/skia.gyp:skia',
'../third_party/WebKit/public/blink_headers.gyp:blink_headers',
'../third_party/icu/icu.gyp:icuuc',
- '../third_party/libjingle/libjingle.gyp:libjingle',
'../ui/accessibility/accessibility.gyp:accessibility',
'../ui/base/ui_base.gyp:ui_base',
'../ui/events/ipc/events_ipc.gyp:events_ipc',
@@ -719,6 +718,11 @@
'common/gpu/media/android_video_encode_accelerator.h',
],
}],
+ ['enable_webrtc==1', {
+ 'dependencies': [
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ ],
+ }],
['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
'dependencies': [
'../media/media.gyp:media',
« no previous file with comments | « content/common/content_message_generator.h ('k') | content/shell/renderer/test_runner/web_frame_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698