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

Unified Diff: chromecast/media/media.gyp

Issue 1140583002: Adds new libcast_media shared library for cast_shell media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enable_default_cast_media -> use_default_libcast_media 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
Index: chromecast/media/media.gyp
diff --git a/chromecast/media/media.gyp b/chromecast/media/media.gyp
index 7aa3d5ba06b5133e7e3cf2b79ebc39f37507977b..20b1dc0c1347bac2c1dee3df0decdd9eb07dc632 100644
--- a/chromecast/media/media.gyp
+++ b/chromecast/media/media.gyp
@@ -6,6 +6,8 @@
'variables': {
'chromium_code': 1,
'chromecast_branding%': 'Chromium',
+ 'libcast_media_gyp%': '',
+ 'use_default_libcast_media%': 1,
},
'targets': [
{
@@ -15,6 +17,7 @@
'../../base/base.gyp:base',
'../../crypto/crypto.gyp:crypto',
'../../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+ '<(libcast_media_gyp):libcast_media_1.0',
],
'sources': [
'base/decrypt_context.cc',
@@ -294,5 +297,24 @@
'cma/test/run_all_unittests.cc',
],
},
+ ], # end of targets
+ 'conditions': [
+ ['use_default_libcast_media==1', {
+ 'targets': [
+ {
+ 'target_name': 'libcast_media_1.0',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '../../chromecast/chromecast.gyp:cast_public_api'
+ ],
+ 'include_dirs': [
+ '../..',
+ ],
+ 'sources': [
+ 'base/cast_media_default.cc',
erickung1 2015/05/13 16:48:07 are we planning to move *.fake.* files in cma_back
halliwell 2015/05/13 17:02:20 Yeah, I assume they will move to the default shlib
+ ],
+ }
+ ]
+ }],
],
}

Powered by Google App Engine
This is Rietveld 408576698