diff options
| author | dkovalev@chromium.org <dkovalev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 01:29:50 +0000 |
|---|---|---|
| committer | dkovalev@chromium.org <dkovalev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 01:29:50 +0000 |
| commit | e9cb7466afefe01ed248ba204c2970b902115313 (patch) | |
| tree | ad48243234737d51d1fdb103b72f4443264baee3 /webkit | |
| parent | 60db3a288541eb845b2f26b4e52ce46d2f37b3d7 (diff) | |
| download | chromium_src-e9cb7466afefe01ed248ba204c2970b902115313.zip chromium_src-e9cb7466afefe01ed248ba204c2970b902115313.tar.gz chromium_src-e9cb7466afefe01ed248ba204c2970b902115313.tar.bz2 | |
Enabling External Clear Key CDM on Mac OS
BUG=152864
TEST=clearkeycdmplugin build on Mac OS
Review URL: https://chromiumcodereview.appspot.com/12096104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/crypto/ppapi/clear_key_cdm.cc | 2 | ||||
| -rw-r--r-- | webkit/media/webkit_media.gypi | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc index 2894a52..5192041 100644 --- a/webkit/media/crypto/ppapi/clear_key_cdm.cc +++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc @@ -51,7 +51,7 @@ static base::AtExitManager g_at_exit_manager; // after http://crbug.com/91970 is fixed. static bool InitializeFFmpegLibraries() { base::FilePath file_path; - CHECK(PathService::Get(base::DIR_EXE, &file_path)); + CHECK(PathService::Get(base::DIR_MODULE, &file_path)); CHECK(media::InitializeMediaLibrary(file_path)); return true; } diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi index 7f3551f..28ab5f4 100644 --- a/webkit/media/webkit_media.gypi +++ b/webkit/media/webkit_media.gypi @@ -171,6 +171,11 @@ }, { # 'os_posix != 1 or OS == "mac"' 'type': 'shared_library', }], + ['OS == "mac"', { + 'xcode_settings': { + 'DYLIB_INSTALL_NAME_BASE': '@loader_path', + }, + }] ], 'defines': ['CDM_IMPLEMENTATION'], 'dependencies': [ @@ -223,6 +228,15 @@ '-Wl,-exported_symbol,_PPP_InitializeModule', '-Wl,-exported_symbol,_PPP_ShutdownModule' ]}, + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/clearkeycdmplugin.plugin/Contents/MacOS/', + 'files': [ + '<(PRODUCT_DIR)/libclearkeycdm.dylib', + '<(PRODUCT_DIR)/ffmpegsumo.so' + ] + } + ] }], ], } |