Index: media/capture/BUILD.gn |
diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn |
index b7568088a2711bed355c9ef9917fd03bd1ab4bb7..31fd7ef935e2fdd709c0b2dbbe61d442b9d12812 100644 |
--- a/media/capture/BUILD.gn |
+++ b/media/capture/BUILD.gn |
@@ -6,10 +6,33 @@ import("//build/config/features.gni") |
import("//media/media_options.gni") |
import("//testing/test.gni") |
-component("capture") { |
+group("capture") { |
+ public_deps = [ |
+ ":capture_lib", |
+ "//media/capture/mojo:capture_types", |
+ "//services/service_manager/public/cpp", |
+ ] |
+} |
+ |
+# Things needed by //media/capture/mojo:capture_types. |
+component("capture_base") { |
defines = [ "CAPTURE_IMPLEMENTATION" ] |
sources = [ |
"capture_export.h", |
+ "video_capture_types.cc", |
+ "video_capture_types.h", |
+ ] |
+ deps = [ |
+ "//base", |
+ "//base:i18n", |
+ "//media", |
+ "//ui/gfx", |
+ ] |
+} |
+ |
+component("capture_lib") { |
+ defines = [ "CAPTURE_IMPLEMENTATION" ] |
+ sources = [ |
"content/animated_content_sampler.cc", |
"content/animated_content_sampler.h", |
"content/capture_resolution_chooser.cc", |
@@ -86,32 +109,27 @@ component("capture") { |
"video/win/video_capture_device_mf_win.h", |
"video/win/video_capture_device_win.cc", |
"video/win/video_capture_device_win.h", |
- "video_capture_types.cc", |
- "video_capture_types.h", |
"video_capturer_source.cc", |
"video_capturer_source.h", |
] |
- public_deps = [] |
+ public_deps = [ |
+ ":capture_base", |
+ ] |
+ |
deps = [ |
"//base", |
"//base:i18n", |
"//media", |
+ "//media/capture/mojo:capture_types", |
"//media/capture/mojo:image_capture", |
- "//skia", |
+ "//media/mojo/interfaces:interfaces", |
+ "//services/service_manager/public/cpp", |
"//third_party/libyuv", |
"//ui/display", |
"//ui/gfx", |
] |
- configs += [ |
- # TODO(mcasas): media/base should be a component and not a source_set, but |
- # it depends on parts of media/filters, media/ffmpeg etc. Until then, we |
- # pretend to be inside media.dll and duplicate the few symbols needed, see |
- # https://crbug.com/590017. |
- "//media:media_implementation", |
- ] |
- |
if (is_android) { |
public_deps += [ |
"content/android", |
@@ -136,10 +154,7 @@ component("capture") { |
} |
if (is_win) { |
- deps += [ |
- "//media/base", # For media_switches. |
- "//media/base/win", |
- ] |
+ deps += [ "//media/base/win" ] |
libs = [ |
"mf.lib", |
"mfplat.lib", |
@@ -174,6 +189,7 @@ test("capture_unittests") { |
"video/linux/camera_config_chromeos_unittest.cc", |
"video/linux/v4l2_capture_delegate_unittest.cc", |
"video/mac/video_capture_device_factory_mac_unittest.mm", |
+ "video/video_capture_device_client_unittest.cc", |
"video/video_capture_device_unittest.cc", |
] |
@@ -181,6 +197,7 @@ test("capture_unittests") { |
":capture", |
"//base/test:run_all_unittests", |
"//base/test:test_support", |
+ "//media", |
"//media/base:test_support", |
"//media/capture/mojo:image_capture", |
"//testing/gmock", |