diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 17:26:00 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 17:26:00 +0000 |
| commit | 5fed8701757fd8c8354e9a0d6ec68a82ed107c15 (patch) | |
| tree | b47a79c7be589efb615662d03602eab49a53f373 /third_party/widevine | |
| parent | c125216aa918b487cdc531b69dd78a462f41e1ac (diff) | |
| download | chromium_src-5fed8701757fd8c8354e9a0d6ec68a82ed107c15.zip chromium_src-5fed8701757fd8c8354e9a0d6ec68a82ed107c15.tar.gz chromium_src-5fed8701757fd8c8354e9a0d6ec68a82ed107c15.tar.bz2 | |
Correctly link against the Linux ia32 CDM.
Review URL: https://codereview.chromium.org/12374069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/widevine')
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index 72da8da..a19500c 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -48,7 +48,7 @@ 'target_name': 'widevinecdmadapter', 'type': 'none', 'conditions': [ - [ 'branding == "Chrome"', { + [ 'branding == "Chrome" and OS != "android" or OS != "ios"', { 'dependencies': [ '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', 'widevine_cdm_version_h', @@ -65,17 +65,15 @@ 'type': 'loadable_module', # Allow the plugin wrapper to find the CDM in the same directory. 'ldflags': ['-Wl,-rpath=\$$ORIGIN'], - }], - [ 'chromeos == 1 and target_arch == "arm"', { - 'libraries': [ - # Copied by widevine_cdm_binaries. - '<(PRODUCT_DIR)/libwidevinecdm.so', - ], - }], - [ 'chromeos == 0 and OS == "linux" and target_arch == "x64"', { - 'libraries': [ - # Copied by widevine_cdm_binaries. - '<(PRODUCT_DIR)/libwidevinecdm.so', + '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', + ], + }], ], }], [ 'OS == "win" and 0', { |