| Index: webrtc/modules/video_capture/BUILD.gn
|
| diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn
|
| index 3df74b62e13355dd8b5cc7de5c4c2a6faef8b147..5cd06c611770cf96975fc1e8f409b9c1d28c81bf 100644
|
| --- a/webrtc/modules/video_capture/BUILD.gn
|
| +++ b/webrtc/modules/video_capture/BUILD.gn
|
| @@ -106,6 +106,11 @@ if (!build_with_chromium) {
|
| ]
|
|
|
| libs = [
|
| + # For NSAlert in video_capture_qtkit_info_objc.mm.
|
| + "Cocoa.framework",
|
| +
|
| + # For GetGestalt in video_capture_mac.mm.
|
| + "CoreServices.framework",
|
| "CoreVideo.framework",
|
| "QTKit.framework",
|
| ]
|
| @@ -165,8 +170,7 @@ if (!build_with_chromium) {
|
| }
|
| }
|
|
|
| - # TODO(mflodman): Change to "if (!is_android)" when tests are working on Mac
|
| - if (is_linux && rtc_include_tests) {
|
| + if (!is_android && rtc_include_tests) {
|
| test("video_capture_tests") {
|
| sources = [
|
| "test/video_capture_main_mac.mm",
|
| @@ -196,16 +200,17 @@ if (!build_with_chromium) {
|
| deps = [
|
| ":video_capture_internal_impl",
|
| ":video_capture_module",
|
| - "//webrtc/modules/utility",
|
| - "//webrtc/system_wrappers",
|
| - "//webrtc/test:video_test_common",
|
| + "../../system_wrappers:system_wrappers_default",
|
| + "../../test:video_test_common",
|
| + "../utility",
|
| + "//testing/gtest",
|
| ]
|
| - if (!is_mac) {
|
| + if (is_mac) {
|
| + deps += [ "//webrtc/test:test_support_main_threaded_mac" ]
|
| + } else {
|
| deps += [ "//webrtc/test:test_support_main" ]
|
| }
|
|
|
| - # TODO(mflodman): Add Mac dependencies / xcode_settings.
|
| -
|
| if (is_clang) {
|
| # Suppress warnings from Chrome's Clang plugins.
|
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
|
|