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

Unified Diff: webrtc/modules/desktop_capture/BUILD.gn

Issue 2597923002: Revert of Refactor webrtc/modules/desktop_capture for GN check (Closed)
Patch Set: Manually solved merge conflict Created 4 years 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 | « .gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/desktop_capture/BUILD.gn
diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn
index 6a10c34b149b98847d63fe6190e16174af82a644..5d27994a2f108dbd8f90af5bb8c939e75f038ba4 100644
--- a/webrtc/modules/desktop_capture/BUILD.gn
+++ b/webrtc/modules/desktop_capture/BUILD.gn
@@ -22,14 +22,10 @@ rtc_static_library("primitives") {
"desktop_region.h",
"shared_desktop_frame.cc",
"shared_desktop_frame.h",
- "shared_memory.cc",
- "shared_memory.h",
]
deps = [
- "../..:webrtc_common",
"../../base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
- "../../system_wrappers:system_wrappers",
]
}
@@ -45,10 +41,6 @@ if (rtc_include_tests) {
"rgba_color.cc",
"rgba_color.h",
]
- deps = [
- ":primitives",
- "../..:webrtc_common",
- ]
}
source_set("screen_drawer") {
@@ -65,11 +57,6 @@ if (rtc_include_tests) {
"screen_drawer_mac.cc",
"screen_drawer_win.cc",
]
- deps = [
- ":primitives",
- "../../base:rtc_base_approved",
- "../../system_wrappers:system_wrappers",
- ]
}
source_set("desktop_capture_mock") {
@@ -88,11 +75,7 @@ if (rtc_include_tests) {
"fake_desktop_capturer.h",
"mock_desktop_capturer_callback.cc",
"mock_desktop_capturer_callback.h",
- ]
- deps = [
- ":primitives",
- "../../base:rtc_base_approved",
- "../../test:test_support",
+ "screen_capturer_mock_objects.h",
]
}
}
@@ -138,6 +121,8 @@ rtc_static_library("desktop_capture") {
"screen_capturer_helper.h",
"screen_capturer_mac.mm",
"screen_capturer_win.cc",
+ "shared_memory.cc",
+ "shared_memory.h",
"win/cursor.cc",
"win/cursor.h",
"win/d3d_device.cc",
@@ -213,7 +198,6 @@ rtc_static_library("desktop_capture") {
deps = [
":primitives",
- "../..:webrtc_common",
"../../base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
"../../system_wrappers",
"//third_party/libyuv",
« no previous file with comments | « .gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698