Revert of Revert of Use BoringSSL in the implementation of ClearKey for Chromecast. (patchset #1 id:1 of https://codereview.chromium.org/1141243003/)
Reason for revert:
OK to replay now
Original issue's description:
> Revert of Use BoringSSL in the implementation of ClearKey for Chromecast. (patchset #1 id:1 of https://codereview.chromium.org/1130893008/)
>
> Reason for revert:
> Temporary revert until Monday (blocked on some other internal changes).
>
> Original issue's description:
> > Use BoringSSL in the implementation of ClearKey for Chromecast.
> > (Previously, this was used only with the "Chrome" branding).
> >
> > BUG= 488572
> >
> > R=gunsch@chromium.org
> >
> > Committed: https://crrev.com/defd2af08f3753687cb2d86b34bbec9da31ccbab
> > Cr-Commit-Position: refs/heads/master@{#330156}
>
> TBR=ddorwin@chromium.org,dougsteed@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG= 488572
>
> Committed: https://crrev.com/564d81833f28f73b9413c6d01725530ff91de64c
> Cr-Commit-Position: refs/heads/master@{#330230}
TBR=ddorwin@chromium.org,dougsteed@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 488572
Review URL: https://codereview.chromium.org/1148433002
Cr-Commit-Position: refs/heads/master@{#330372}
diff --git a/chromecast/media/media.gyp b/chromecast/media/media.gyp
index 20b1dc0c..125e278 100644
--- a/chromecast/media/media.gyp
+++ b/chromecast/media/media.gyp
@@ -195,17 +195,7 @@
'../../base/base.gyp:base',
'../../crypto/crypto.gyp:crypto',
'../../media/media.gyp:media',
- ],
- 'conditions': [
- ['chromecast_branding=="Chrome"', {
- 'dependencies': [
- '../internal/cast_system.gyp:openssl',
- ],
- }, {
- 'dependencies': [
- '../../third_party/boringssl/boringssl.gyp:boringssl',
- ],
- }],
+ '../../third_party/boringssl/boringssl.gyp:boringssl',
],
'sources': [
'cma/pipeline/audio_pipeline.cc',
