media/media.gyp - Issue 22362007: Relocate last remnants of webkit/renderer/media code.

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 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make chromeos crypto dep explicit. Created 7 years, 4 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:

Index: media/media.gyp

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

index c0a08e4b86ab71c1bfbd17add68b169f9d7aa911..c685090fd17a0fcf169e3043e3aeae5d12cf31df 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -314,8 +314,8 @@

'base/video_util.h',

'base/yuv_convert.cc',

'base/yuv_convert.h',

- 'crypto/aes_decryptor.cc',

- 'crypto/aes_decryptor.h',

+ 'cdm/aes_decryptor.cc',

+ 'cdm/aes_decryptor.h',

'ffmpeg/ffmpeg_common.cc',

'ffmpeg/ffmpeg_common.h',

'filters/audio_decoder_selector.cc',

@@ -945,7 +945,7 @@

'base/video_frame_unittest.cc',

'base/video_util_unittest.cc',

'base/yuv_convert_unittest.cc',

- 'crypto/aes_decryptor_unittest.cc',

+ 'cdm/aes_decryptor_unittest.cc',

'ffmpeg/ffmpeg_common_unittest.cc',

'filters/audio_decoder_selector_unittest.cc',

'filters/audio_file_reader_unittest.cc',

@@ -1294,6 +1294,9 @@

], # targets

}],

['OS!="ios"', {

+ 'includes': [

+ 'media_cdm.gypi',

+ ],

'targets': [

{

# Minimal target for NaCl and other renderer side media clients which

« no previous file with comments | « media/filters/pipeline_integration_test.cc ('k') | media/media_cdm.gypi » ('j') | no next file with comments »