chromecast/chromecast.gyp - Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/chromecast.gyp

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: added components/cdm OWNERS to components/cdm.gypi (per-file) Created 5 years, 8 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

« android_webview/java/src/org/chromium/android_webview/AwResource.java ('K') | « chromecast/browser/media/cast_media_client_android.cc ('k') | chromecast/media/base/key_systems_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/chromecast.gyp

diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp

index 5c2e49c5225b8af319be5dbddc7f64fb06f3162b..82ade9ad32df4f7fa3ca1d7be077d15ca0bbfdc2 100644

--- a/chromecast/chromecast.gyp

+++ b/chromecast/chromecast.gyp

@@ -185,6 +185,7 @@

'chromecast_locales.gyp:chromecast_locales_pak',

'chromecast_locales.gyp:chromecast_settings',

'media/media.gyp:media_base',

+ 'media/media.gyp:media_cdm',

'../base/base.gyp:base',

'../components/components.gyp:breakpad_host',

'../components/components.gyp:cdm_renderer',

@@ -235,6 +236,8 @@

'browser/devtools/remote_debugging_server.h',

'browser/geolocation/cast_access_token_store.cc',

'browser/geolocation/cast_access_token_store.h',

+ 'browser/media/cast_media_client_android.cc',

+ 'browser/media/cast_media_client_android.h',

'browser/metrics/cast_metrics_prefs.cc',

'browser/metrics/cast_metrics_prefs.h',

'browser/metrics/cast_metrics_service_client.cc',

@@ -315,6 +318,11 @@

'../ui/aura/aura.gyp:aura_test_support',

}],

+ ['OS=="android"', {

+ 'dependencies': [

+ '../components/components.gyp:cdm_browser',

+ ],

+ }],

{