diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-04 07:32:53 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-04 07:32:53 +0000 |
| commit | d273c9208490d37881abcb65084c944067222fa8 (patch) | |
| tree | d0a1ec212aeaa30b482e7e71f11262585dc25e2b /third_party/widevine/cdm | |
| parent | 649e9b26bbae94236bd76de85a64f395b4f20624 (diff) | |
| download | chromium_src-d273c9208490d37881abcb65084c944067222fa8.zip chromium_src-d273c9208490d37881abcb65084c944067222fa8.tar.gz chromium_src-d273c9208490d37881abcb65084c944067222fa8.tar.bz2 | |
Revert 198300 "Build the Widevine CDM adapter on Win."
> Build the Widevine CDM adapter on Win.
>
> When building the adapter we'll see LNK2019 error and LNK4075/LNK4088 warnings. These are expected.
>
> The linking will succeed regardless and the adapter will be generated. These errors/warnings will be resolved later.
>
> BUG=180260,237636
> R=ddorwin@chromium.org
>
> Review URL: https://codereview.chromium.org/14789015
TBR=xhwang@chromium.org
Review URL: https://codereview.chromium.org/14863005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/widevine/cdm')
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index 2df98b2..67efd99 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -70,16 +70,8 @@ '<(PRODUCT_DIR)/libwidevinecdm.so', ], }], - [ 'OS == "win"', { + [ 'OS == "win" and 0', { 'type': 'shared_library', - # See http://crbug.com/237636. - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalOptions': [ - '/FORCE:UNRESOLVED', - ], - }, - }, }], [ 'OS == "mac"', { 'type': 'loadable_module', |