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

Unified Diff: media/BUILD.gn

Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move media glue code back to base/mac and add suitable rules in build files to compile the code for… Created 6 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
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 1c3ee413a66dfa50e916dad67f675bdcb92fd701..89fac88c026b6632b7a2773d7a2e853e6fa0a41a 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -160,10 +160,6 @@ component("media") {
"video/capture/linux/video_capture_device_linux.h",
"video/capture/linux/video_capture_device_chromeos.cc",
"video/capture/linux/video_capture_device_chromeos.h",
- "video/capture/mac/avfoundation_glue.h",
- "video/capture/mac/avfoundation_glue.mm",
- "video/capture/mac/coremedia_glue.h",
- "video/capture/mac/coremedia_glue.mm",
"video/capture/mac/platform_video_capturing_mac.h",
"video/capture/mac/video_capture_device_avfoundation_mac.h",
"video/capture/mac/video_capture_device_avfoundation_mac.mm",
@@ -333,6 +329,9 @@ component("media") {
}
if (is_mac) {
+ deps += [
+ "//media/base/mac",
+ ]
libs += [
"CoreMIDI.framework",
"CoreVideo.framework",
@@ -341,6 +340,18 @@ component("media") {
]
}
+ if (is_ios) {
+ deps += [
+ "//media/base/mac",
+ ]
+ libs += [
+ "CoreMedia.framework",
Robert Sesek 2014/09/03 21:03:56 This list doesn't match the one in gyp.
jfroy 2014/09/03 21:17:00 Noted. See my other comment about the iOS changes
+ "CoreMIDI.framework",
+ "CoreVideo.framework",
+ "OpenGLES.framework",
+ ]
+ }
+
if (is_win) {
libs += [
"mf.lib",
« no previous file with comments | « content/browser/device_monitor_mac.mm ('k') | media/base/mac/BUILD.gn » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698