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

Unified Diff: content/test/BUILD.gn

Issue 912633003: libjingle build fixes to enable_webrtc in the Linux GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn format Created 5 years, 10 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 | « build/config/features.gni ('k') | third_party/libjingle/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index e9f0372ca407ac81848bec9159b7ef61366cf73b..ef135d35b1da0d39e4f497c6f4a753604746742c 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -82,12 +82,11 @@ static_library("test_support") {
}
if (enable_webrtc) {
- # TODO(GYP) remove this when libjingle is converted.
- configs += [ "//third_party/libjingle:jingle_direct_dependent_configs" ]
-
sources += [
"../renderer/media/mock_media_stream_dispatcher.cc",
"../renderer/media/mock_media_stream_dispatcher.h",
+ "../renderer/media/mock_data_channel_impl.cc",
+ "../renderer/media/mock_data_channel_impl.h",
"../renderer/media/mock_peer_connection_impl.cc",
"../renderer/media/mock_peer_connection_impl.h",
"../renderer/media/mock_web_rtc_peer_connection_handler_client.cc",
@@ -97,8 +96,8 @@ static_library("test_support") {
]
deps += [
- #"//third_party/libjingle:webrtc", TODO(GYP)
- #"//third_party/libjingle:peerconnection", TODO(GYP)
+ "//third_party/libjingle:libjingle_webrtc",
+ "//third_party/libjingle:libpeerconnection",
"//third_party/webrtc/modules/video_capture",
]
}
@@ -528,8 +527,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac
}
if (is_chromeos) {
- sources +=
- [ "browser/media/capture/desktop_capture_device_aura_unittest.cc" ]
+ sources += [ "../browser/media/capture/desktop_capture_device_aura_unittest.cc" ]
}
} else {
if (enable_plugins) {
« no previous file with comments | « build/config/features.gni ('k') | third_party/libjingle/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698