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

Unified Diff: content/browser/BUILD.gn

Issue 533743004: Fix Chrome linker errors in GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « content/BUILD.gn ('k') | content/public/renderer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index b92154cee837d76debab8e6efa4403708dbe9db6..85798bfd5c0066b50867b3df1a879d058e9a1baf 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -113,8 +113,9 @@ source_set("browser") {
configs += [
"//content:content_implementation",
- "//content:libjingle_stub_config", # TODO(GYP) remove when libjingle is ready.
- "//content:webrtc_stub_config", # TODO(GYP) remove when webrtc is ready.
+
+ # TODO(GYP) remove this when libjingle_webrtc is working.
+ "//third_party/libjingle:jingle_direct_dependent_configs", # TODO(GYP)
]
if (toolkit_views) {
@@ -156,11 +157,9 @@ source_set("browser") {
if (enable_webrtc) {
sources += rebase_path(content_browser_gypi_values.webrtc_browser_sources,
".", "//content")
- # TODO(GYP)
- #deps += [ "//jingle:glue" ]
+ deps += [ "//jingle:jingle_glue" ]
if (is_linux) {
- # TODO(GYP)
- #deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+ #deps += [ "//third_party/libjingle:libjingle_webrtc" ] TODO(GYP)
}
if (is_linux || is_mac || is_win) {
sources += [
@@ -176,8 +175,7 @@ source_set("browser") {
]
}
defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
- # TODO(GYP)
- #deps += [ "//third_party/webrtc/modules:desktop_capture" ]
+ deps += [ "//third_party/webrtc/modules/desktop_capture" ]
}
}
« no previous file with comments | « content/BUILD.gn ('k') | content/public/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698