Reland of Refactor webrtc/modules/desktop_capture for GN check
Reason for revert: Trying to reland this CL. Original issue's description: > Revert of Refactor webrtc/modules/desktop_capture for GN check (patchset #1 id:1 of https://codereview.webrtc.org/2593713002/ ) > > Reason for revert: > Apparently breaks Chromium compile for unknown reason: > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/12314 > > Original issue's description: > > Refactor webrtc/modules/desktop_capture for GN check > > > > This moves some GN check configurations out of .gn to individual > > targets. > > > > The now checked target is: > > "//webrtc/modules/desktop_capture/*" > > > > BUG=webrtc:6828 > > NOTRY=True > > > > Review-Url: https://codereview.webrtc.org/2593713002 > > Cr-Commit-Position: refs/heads/master@{#15725} > > Committed:70870b9211> > TBR=sergeyu@chromium.org,mbonadei@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6828 > > Review-Url: https://codereview.webrtc.org/2597923002 > Cr-Commit-Position: refs/heads/master@{#15750} > Committed:d943c48454TBR=sergeyu@chromium.org,kjellander@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:6828 Review-Url: https://codereview.webrtc.org/2609523002 Cr-Commit-Position: refs/heads/master@{#15832}
This commit is contained in:
parent
0c7a386c9e
commit
f423593f55
1
.gn
1
.gn
@ -31,6 +31,7 @@ check_targets = [
|
||||
"//webrtc/modules/audio_processing/*",
|
||||
"//webrtc/modules/bitrate_controller/*",
|
||||
"//webrtc/modules/congestion_controller/*",
|
||||
"//webrtc/modules/desktop_capture/*",
|
||||
"//webrtc/modules/media_file/*",
|
||||
"//webrtc/modules/pacing/*",
|
||||
"//webrtc/modules/rtp_rtcp/*",
|
||||
|
||||
@ -22,9 +22,12 @@ 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.
|
||||
]
|
||||
}
|
||||
@ -41,6 +44,11 @@ if (rtc_include_tests) {
|
||||
"rgba_color.cc",
|
||||
"rgba_color.h",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":primitives",
|
||||
"../..:webrtc_common",
|
||||
]
|
||||
}
|
||||
|
||||
source_set("screen_drawer") {
|
||||
@ -57,6 +65,12 @@ if (rtc_include_tests) {
|
||||
"screen_drawer_mac.cc",
|
||||
"screen_drawer_win.cc",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":primitives",
|
||||
"../../base:rtc_base_approved",
|
||||
"../../system_wrappers",
|
||||
]
|
||||
}
|
||||
|
||||
source_set("desktop_capture_mock") {
|
||||
@ -75,7 +89,12 @@ if (rtc_include_tests) {
|
||||
"fake_desktop_capturer.h",
|
||||
"mock_desktop_capturer_callback.cc",
|
||||
"mock_desktop_capturer_callback.h",
|
||||
"screen_capturer_mock_objects.h",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":primitives",
|
||||
"../../base:rtc_base_approved",
|
||||
"../../test:test_support",
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -121,8 +140,6 @@ 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",
|
||||
@ -198,6 +215,7 @@ 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",
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -40,4 +39,3 @@ const ScreenId kInvalidScreenId = -2;
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
|
||||
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
#include <memory>
|
||||
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/system_wrappers/include/atomic32.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user