media/media.gyp - Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/media.gyp

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: Remove iOS-related changes to media build files. 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

« no previous file with comments | « media/base/mac/coremedia_glue.mm ('k') | media/video/capture/mac/avfoundation_glue.h » ('j') | media/video/capture/mac/video_capture_device_avfoundation_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 71242666b7c665bd6af08c51b187190979576877..a777ef8be6e1a9bfceb50eafdcfcaefbf368b2e5 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -281,6 +281,10 @@

'base/djb2.h',

'base/keyboard_event_counter.cc',

'base/keyboard_event_counter.h',

+ 'base/mac/avfoundation_glue.h',

+ 'base/mac/avfoundation_glue.mm',

+ 'base/mac/coremedia_glue.h',

+ 'base/mac/coremedia_glue.mm',

'base/media.cc',

'base/media.h',

'base/media_file_checker.cc',

@@ -490,10 +494,6 @@

'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',