diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 23:26:11 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 23:26:11 +0000 |
| commit | 419b4f7462b863e5ce9d26b10e4a5cc048da5a2e (patch) | |
| tree | 3ef008121e034a092ddc998b5716ea5d82dae675 /third_party/widevine/cdm | |
| parent | e6dd455c5d75391061b82aad746bd5cd474dc8fd (diff) | |
| download | chromium_src-419b4f7462b863e5ce9d26b10e4a5cc048da5a2e.zip chromium_src-419b4f7462b863e5ce9d26b10e4a5cc048da5a2e.tar.gz chromium_src-419b4f7462b863e5ce9d26b10e4a5cc048da5a2e.tar.bz2 | |
Fix Widevine CDM adapter linking on Mac.
BUG=238742
R=xhwang@chromium.org
Review URL: https://codereview.chromium.org/17155026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/widevine/cdm')
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index 2ff4df2..17b29da 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -80,13 +80,12 @@ '<(PRODUCT_DIR)/widevinecdm.dll.lib', ], }], - [ 'OS == "mac"', { + [ 'OS == "mac" and target_arch == "ia32"', { 'type': 'loadable_module', 'product_extension': 'plugin', 'libraries': [ # Copied by widevine_cdm_binaries. - # See http://crbug.com/237636. - #'<(PRODUCT_DIR)/libwidevinecdm.dylib', + '<(PRODUCT_DIR)/libwidevinecdm.dylib', ], 'xcode_settings': { 'OTHER_LDFLAGS': [ @@ -94,8 +93,6 @@ '-Wl,-exported_symbol,_PPP_GetInterface', '-Wl,-exported_symbol,_PPP_InitializeModule', '-Wl,-exported_symbol,_PPP_ShutdownModule', - # See http://crbug.com/237636. - '-Wl,-undefined,dynamic_lookup', ], 'DYLIB_INSTALL_NAME_BASE': '@loader_path', }, |