summaryrefslogtreecommitdiffstats
path: root/chromecast
diff options
context:
space:
mode:
authorbyungchul <byungchul@chromium.org>2015-09-29 16:58:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-29 23:59:39 +0000
commitf8addc23acddc7aa8a6558a4b26250f72bf8f271 (patch)
treef19d0f1e4538f0b38a366849e17834a2d40ead17 /chromecast
parent8a68719d2c871cacd4f27b1f5232ada6759fc91e (diff)
downloadchromium_src-f8addc23acddc7aa8a6558a4b26250f72bf8f271.zip
chromium_src-f8addc23acddc7aa8a6558a4b26250f72bf8f271.tar.gz
chromium_src-f8addc23acddc7aa8a6558a4b26250f72bf8f271.tar.bz2
Link libcast_media_1.0 default (dummy) implementation in compile time.
The actual implementations of libcast_media_1.0 will be defined in vendor directories with different target names. BUG=internal b/23905603 Review URL: https://codereview.chromium.org/1379613003 Cr-Commit-Position: refs/heads/master@{#351443}
Diffstat (limited to 'chromecast')
-rw-r--r--chromecast/chromecast.gni9
-rw-r--r--chromecast/media/BUILD.gn14
-rw-r--r--chromecast/media/media.gyp41
3 files changed, 20 insertions, 44 deletions
diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni
index 5fe8adb..016374a 100644
--- a/chromecast/chromecast.gni
+++ b/chromecast/chromecast.gni
@@ -22,15 +22,6 @@ declare_args() {
# be named "libcast_graphics_1.0".
libcast_graphics_path = ""
- # Use the stub media library in //chromecast/media. If this is true, the
- # value of |libcast_media_path| is ignored.
- use_default_cast_media =
- chromecast_branding == "public" || is_chromecast_desktop_build
-
- # The path to the cast_media shared library. Any target pointed to must be
- # named "libcast_media_1.0".
- libcast_media_path = ""
-
# Use Playready CDMs.
use_playready = false
}
diff --git a/chromecast/media/BUILD.gn b/chromecast/media/BUILD.gn
index 52536d8..b1aafe7 100644
--- a/chromecast/media/BUILD.gn
+++ b/chromecast/media/BUILD.gn
@@ -61,17 +61,9 @@ test("cast_media_unittests") {
]
}
-group("libcast_media") {
- if (use_default_cast_media) {
- public_deps = [
- "//chromecast/media/base:libcast_media_default",
- ]
- } else {
- public_deps = [
- "$libcast_media_path:libcast_media_1.0",
- ]
- }
-}
+public_deps = [
+ "//chromecast/media/base:libcast_media_default",
+]
# TODO(slan): delete this target once Chromecast M44/earlier is obsolete.
# See: b/21639416
diff --git a/chromecast/media/media.gyp b/chromecast/media/media.gyp
index d7d25da..0b87875 100644
--- a/chromecast/media/media.gyp
+++ b/chromecast/media/media.gyp
@@ -6,8 +6,6 @@
'variables': {
'chromium_code': 1,
'chromecast_branding%': 'public',
- 'libcast_media_gyp%': '',
- 'use_default_libcast_media%': 1,
},
'target_defaults': {
'include_dirs': [
@@ -41,10 +39,10 @@
'target_name': 'media_base',
'type': '<(component)',
'dependencies': [
+ 'libcast_media_1.0',
'../../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_impl.cc',
@@ -140,7 +138,6 @@
'target_name': 'default_cma_backend',
'type': '<(component)',
'dependencies': [
- '../chromecast.gyp:cast_base',
'../../base/base.gyp:base',
],
'include_dirs': [
@@ -316,25 +313,21 @@
'cma/test/run_all_unittests.cc',
],
},
+ { # Target for OEM partners to override media shared library, i.e.
+ # libcast_media_1.0.so. This target is only used to build executables
+ # with correct linkage information.
+ 'target_name': 'libcast_media_1.0',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '../../chromecast/chromecast.gyp:cast_public_api',
+ 'default_cma_backend'
+ ],
+ 'include_dirs': [
+ '../..',
+ ],
+ 'sources': [
+ 'base/cast_media_default.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',
- 'default_cma_backend'
- ],
- 'include_dirs': [
- '../..',
- ],
- 'sources': [
- 'base/cast_media_default.cc',
- ],
- }
- ]
- }],
- ],
}