Skip to content

Commit

Permalink
Revert of Revert of Use BoringSSL in the implementation of ClearKey f…
Browse files Browse the repository at this point in the history
…or 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}
  • Loading branch information
gunsch authored and Commit bot committed May 18, 2015
1 parent 7aead31 commit be51eda
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions chromecast/media/media.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit be51eda

Please sign in to comment.