diff options
| author | dkovalev@chromium.org <dkovalev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 12:41:24 +0000 |
|---|---|---|
| committer | dkovalev@chromium.org <dkovalev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 12:41:24 +0000 |
| commit | 6ac0b82e4289c6a94088e6b12e1e0536729660a3 (patch) | |
| tree | 3b285c6f7569724611d3f7799b3413605958994f | |
| parent | dcce0ff202ca7994b8768aa57a9779398c3ca53e (diff) | |
| download | chromium_src-6ac0b82e4289c6a94088e6b12e1e0536729660a3.zip chromium_src-6ac0b82e4289c6a94088e6b12e1e0536729660a3.tar.gz chromium_src-6ac0b82e4289c6a94088e6b12e1e0536729660a3.tar.bz2 | |
Fixing cdm build on Mac OS.
BUG=152864
TEST=cdm build on Mac OS
Review URL: https://chromiumcodereview.appspot.com/12811005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188370 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/chrome_paths.cc | 2 | ||||
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index c9b6e2f..c7238bd 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -367,7 +367,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif #if defined(WIDEVINE_CDM_AVAILABLE) case chrome::FILE_WIDEVINE_CDM_PLUGIN: - if (!PathService::Get(base::DIR_MODULE, &cur)) + if (!GetInternalPluginsDirectory(&cur)) return false; cur = cur.Append(kWidevineCdmPluginFileName); break; diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index 01cd4e5..1d266f7 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -77,6 +77,10 @@ 'type': 'loadable_module', 'mac_bundle': 1, 'product_extension': 'plugin', + 'libraries': [ + # Copied by widevine_cdm_binaries. + '<(PRODUCT_DIR)/libwidevinecdm.dylib', + ], 'xcode_settings': { 'OTHER_LDFLAGS': [ # Not to strip important symbols by -Wl,-dead_strip. @@ -84,6 +88,15 @@ '-Wl,-exported_symbol,_PPP_InitializeModule', '-Wl,-exported_symbol,_PPP_ShutdownModule' ]}, + 'copies': [ + { + 'destination': + '<(PRODUCT_DIR)/widevinecdmadapter.plugin/Contents/MacOS/', + 'files': [ + '<(PRODUCT_DIR)/libwidevinecdm.dylib', + ] + } + ] }], ], }], |