Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Unified Diff: chromecast/media/media.gyp

Issue 1141243003: Revert of Use BoringSSL in the implementation of ClearKey for Chromecast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/media.gyp
diff --git a/chromecast/media/media.gyp b/chromecast/media/media.gyp
index 125e278b46c3c09ab58202e4d37994be85caa866..20b1dc0c1347bac2c1dee3df0decdd9eb07dc632 100644
--- a/chromecast/media/media.gyp
+++ b/chromecast/media/media.gyp
@@ -195,7 +195,17 @@
'../../base/base.gyp:base',
'../../crypto/crypto.gyp:crypto',
'../../media/media.gyp:media',
- '../../third_party/boringssl/boringssl.gyp:boringssl',
+ ],
+ 'conditions': [
+ ['chromecast_branding=="Chrome"', {
+ 'dependencies': [
+ '../internal/cast_system.gyp:openssl',
+ ],
+ }, {
+ 'dependencies': [
+ '../../third_party/boringssl/boringssl.gyp:boringssl',
+ ],
+ }],
],
'sources': [
'cma/pipeline/audio_pipeline.cc',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698