diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 08:21:16 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 08:21:16 +0000 |
| commit | 177bcf8faa90b3544ac7879f81138d8802227a85 (patch) | |
| tree | c7be51e4a949a1ca2aab4abded2940527b8fdda1 /third_party | |
| parent | e2a322b92337f3dce9012b2fd1ede6459dd808b4 (diff) | |
| download | chromium_src-177bcf8faa90b3544ac7879f81138d8802227a85.zip chromium_src-177bcf8faa90b3544ac7879f81138d8802227a85.tar.gz chromium_src-177bcf8faa90b3544ac7879f81138d8802227a85.tar.bz2 | |
Relocate last remnants of webkit/renderer/media code.
- Moves webkit/renderer/media/crypto/ppapi/ to media/cdm/ppapi/
- Moves webkit/.../ppapi/cdm/ to media/cdm/ppapi/api/
- Moves everything in webkit_media to media namespace
- Fixes broken builds with use_fake_video_decoder=1 or use_libvpx=1
- Deletes webkit/renderer/media folder (\o/)
BUG=251306
TEST=Chrome builds with mentioned flags, plus branding=Chrome.
TBR=rsleevi
Review URL: https://chromiumcodereview.appspot.com/22362007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index 0d08bc6b..a4185e6 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -56,9 +56,9 @@ 'widevine_cdm_binaries', ], 'sources': [ - '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc', - '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h', - '<(DEPTH)/webkit/renderer/media/crypto/ppapi/linked_ptr.h', + '<(DEPTH)/media/cdm/ppapi/api/content_decryption_module.h', + '<(DEPTH)/media/cdm/ppapi/cdm_wrapper.cc', + '<(DEPTH)/media/cdm/ppapi/linked_ptr.h', ], 'conditions': [ [ 'os_posix == 1 and OS != "mac"', { |