diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 23:52:02 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 23:52:02 +0000 |
| commit | 876395c1e0a01c3889b0605d4779a772215e74de (patch) | |
| tree | 27832e4b588040ebe11feb971c99742b5bb4a7d2 /third_party | |
| parent | 3c0b199de26ed495312901fa56567d0ff9a21ed5 (diff) | |
| download | chromium_src-876395c1e0a01c3889b0605d4779a772215e74de.zip chromium_src-876395c1e0a01c3889b0605d4779a772215e74de.tar.gz chromium_src-876395c1e0a01c3889b0605d4779a772215e74de.tar.bz2 | |
Fix CDM linking on Chrome OS ia32 and x64.
BUG=180694
Review URL: https://codereview.chromium.org/12623003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index eaac98f..01cd4e5 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -65,15 +65,9 @@ 'type': 'loadable_module', # Allow the plugin wrapper to find the CDM in the same directory. 'ldflags': ['-Wl,-rpath=\$$ORIGIN'], - 'conditions': [ - # We have binaries for Linux ia32 & x64 and Chrome OS ARM. The - # build fails if we add the dependency for Chrome OS ia32 & x64. - [ 'chromeos == 0 or target_arch == "arm"', { - 'libraries': [ - # Copied by widevine_cdm_binaries. - '<(PRODUCT_DIR)/libwidevinecdm.so', - ], - }], + 'libraries': [ + # Copied by widevine_cdm_binaries. + '<(PRODUCT_DIR)/libwidevinecdm.so', ], }], [ 'OS == "win" and 0', { |