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

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

Issue 2309253005: Unify the macOS and iOS capturer implementations (Closed)
Patch Set: remove added presubmit filter Created 4 years, 3 months 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 | « no previous file | webrtc/modules/video_capture/ios/device_info_ios.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_capture/BUILD.gn
diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn
index d6e7dce45a364697d29f7d4f8e1308e853f3a25c..fa79ebbfd8e3ae3df93d41cd03d87181e9376649 100644
--- a/webrtc/modules/video_capture/BUILD.gn
+++ b/webrtc/modules/video_capture/BUILD.gn
@@ -60,7 +60,7 @@ rtc_source_set("video_capture") {
if (!build_with_chromium) {
config("video_capture_internal_impl_config") {
- if (is_ios) {
+ if (is_ios || is_mac) {
libs = [
"AVFoundation.framework",
"CoreMedia.framework",
@@ -104,30 +104,6 @@ if (!build_with_chromium) {
]
deps += [ "../..:webrtc_common" ]
}
- if (is_mac) {
- sources = [
- "mac/qtkit/video_capture_qtkit.h",
- "mac/qtkit/video_capture_qtkit.mm",
- "mac/qtkit/video_capture_qtkit_info.h",
- "mac/qtkit/video_capture_qtkit_info.mm",
- "mac/qtkit/video_capture_qtkit_info_objc.h",
- "mac/qtkit/video_capture_qtkit_info_objc.mm",
- "mac/qtkit/video_capture_qtkit_objc.h",
- "mac/qtkit/video_capture_qtkit_objc.mm",
- "mac/qtkit/video_capture_qtkit_utility.h",
- "mac/video_capture_mac.mm",
- ]
-
- 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",
- ]
- }
if (is_win) {
sources = [
"windows/device_info_ds.cc",
@@ -149,16 +125,16 @@ if (!build_with_chromium) {
deps += [ "//third_party/winsdk_samples" ]
}
- if (is_ios) {
+ if (is_ios || is_mac) {
sources = [
- "ios/device_info_ios.h",
- "ios/device_info_ios.mm",
- "ios/device_info_ios_objc.h",
- "ios/device_info_ios_objc.mm",
- "ios/rtc_video_capture_ios_objc.h",
- "ios/rtc_video_capture_ios_objc.mm",
- "ios/video_capture_ios.h",
- "ios/video_capture_ios.mm",
+ "objc/device_info.h",
+ "objc/device_info.mm",
+ "objc/device_info_objc.h",
+ "objc/device_info_objc.mm",
+ "objc/rtc_video_capture_objc.h",
+ "objc/rtc_video_capture_objc.mm",
+ "objc/video_capture.h",
+ "objc/video_capture.mm",
]
cflags = [
@@ -183,7 +159,6 @@ if (!build_with_chromium) {
if (!is_android && rtc_include_tests) {
rtc_test("video_capture_tests") {
sources = [
- "test/video_capture_main_mac.mm",
"test/video_capture_unittest.cc",
]
@@ -215,11 +190,7 @@ if (!build_with_chromium) {
"../utility",
"//testing/gtest",
]
- if (is_mac) {
- deps += [ "//webrtc/test:test_support_main_threaded_mac" ]
- } else {
- deps += [ "//webrtc/test:test_support_main" ]
- }
+ deps += [ "//webrtc/test:test_support_main" ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.
« no previous file with comments | « no previous file | webrtc/modules/video_capture/ios/device_info_ios.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698