Index: media/capture/BUILD.gn |
diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn |
index 619f000f1e885b57704b0a7540a7b4e0d3ccc8ee..f6968116ae6fd15d89b109575dee2b3c22642a2a 100644 |
--- a/media/capture/BUILD.gn |
+++ b/media/capture/BUILD.gn |
@@ -6,10 +6,8 @@ |
import("//media/media_options.gni") |
import("//testing/test.gni") |
-component("capture") { |
- defines = [ "CAPTURE_IMPLEMENTATION" ] |
+source_set("capture") { |
sources = [ |
- "capture_export.h", |
"content/animated_content_sampler.cc", |
"content/animated_content_sampler.h", |
"content/capture_resolution_chooser.cc", |
@@ -27,6 +25,12 @@ |
"device_monitor_mac.mm", |
"system_message_window_win.cc", |
"system_message_window_win.h", |
+ "video/android/photo_capabilities.cc", |
+ "video/android/photo_capabilities.h", |
+ "video/android/video_capture_device_android.cc", |
+ "video/android/video_capture_device_android.h", |
+ "video/android/video_capture_device_factory_android.cc", |
+ "video/android/video_capture_device_factory_android.h", |
"video/fake_video_capture_device.cc", |
"video/fake_video_capture_device.h", |
"video/fake_video_capture_device_factory.cc", |
@@ -79,26 +83,20 @@ |
public_deps = [] |
deps = [ |
"//base", |
- "//base:i18n", |
- "//media", |
+ "//media/base", |
"//skia", |
"//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", |
+ |
+ # TODO(mcasas): Fix size_t to int truncation warning-treated-as-errors. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
] |
if (is_android) { |
- public_deps += [ |
- "video/android", |
- "video/android:capture_java", |
- ] |
+ public_deps += [ "video/android" ] |
deps += [ "video/android:capture_jni_headers" ] |
} |
@@ -107,7 +105,6 @@ |
libs = [ |
"CoreFoundation.framework", |
"CoreGraphics.framework", |
- "CoreVideo.framework", |
"Foundation.framework", |
] |
} |
@@ -121,28 +118,22 @@ |
} |
if (is_win) { |
- deps += [ |
- "//media/base", # For media_switches. |
- "//media/base/win", |
- ] |
+ public_deps += [ "//media/base/win" ] |
libs = [ |
"mf.lib", |
"mfplat.lib", |
"mfreadwrite.lib", |
"mfuuid.lib", |
] |
+ |
ldflags = [ |
"/DELAYLOAD:mf.dll", |
"/DELAYLOAD:mfplat.dll", |
"/DELAYLOAD:mfreadwrite.dll", |
] |
- |
- # TODO(jschuh): https://crbug.com/167187 fix size_t to int truncations. |
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
} |
} |
-# TODO(mcasas): Make this a test target, https://crbug.com/618718. |
source_set("unittests") { |
testonly = true |
@@ -159,13 +150,11 @@ |
] |
deps = [ |
- ":capture", |
+ "//media/base:unittests", |
"//testing/gmock", |
"//testing/gtest", |
] |
- if (is_win) { |
- # TODO(jschuh): https://crbug.com/167187 fix size_t to int truncations. |
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
- } |
+ # TODO(mcasas): Fix size_t to int truncation warning-treated-as-errors. |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
} |