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

Unified Diff: remoting/base/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 | « net/BUILD.gn ('k') | remoting/client/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/BUILD.gn
diff --git a/remoting/base/BUILD.gn b/remoting/base/BUILD.gn
index 46a2b706fc31a7f5b8e95634d85e1f45c1a700ae..3929a9f1147734e1e97a08b6f48d735f3e72bfb1 100644
--- a/remoting/base/BUILD.gn
+++ b/remoting/base/BUILD.gn
@@ -66,8 +66,6 @@ static_library("base") {
]
configs += [ "//build/config/compiler:wexit_time_destructors" ]
- # TODO(GYP) Remove when WebRTC is converted.
- configs += [ "//content:webrtc_stub_config" ]
deps = [
"//base",
@@ -81,7 +79,7 @@ static_library("base") {
"//third_party/libyuv",
"//third_party/opus",
"//third_party/protobuf:protobuf_lite",
- #"//third_party/webrtc/modules/desktop_capture", TODO(GYP)
+ "//third_party/webrtc/modules/desktop_capture",
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry",
@@ -93,5 +91,10 @@ static_library("base") {
"//remoting/proto",
"//third_party/protobuf:protobuf_lite",
]
+
+ # TODO(GYP) This config should be a direct_dependent_config of
+ # //third_party/webrtc/modules/desktop_capture so we shouldn't have to
+ # include it here. Remove this line when the direct_dependent_config is set.
+ configs += [ "//third_party/webrtc:common_inherited_config" ]
}
« no previous file with comments | « net/BUILD.gn ('k') | remoting/client/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698