summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbyungchul <byungchul@chromium.org>2015-10-01 12:15:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-01 19:16:39 +0000
commit86d0a29db0067654762764bf51a69c450435668a (patch)
tree2f35ae79ef353362468c423e2cb7b324bea58063
parent1d35278e5b24ef0b857359c6f1dc0b26e086438a (diff)
downloadchromium_src-86d0a29db0067654762764bf51a69c450435668a.zip
chromium_src-86d0a29db0067654762764bf51a69c450435668a.tar.gz
chromium_src-86d0a29db0067654762764bf51a69c450435668a.tar.bz2
Link default libcast_graphics_1.0 always.
Actual libcast_graphics_1.0 will be built with target type, loadable_module. BUG=internal b/23905603 Review URL: https://codereview.chromium.org/1379183002 Cr-Commit-Position: refs/heads/master@{#351860}
-rw-r--r--chromecast/chromecast.gni9
-rw-r--r--chromecast/chromecast.gyp29
-rw-r--r--chromecast/graphics/BUILD.gn40
-rw-r--r--ui/ozone/platform/cast/BUILD.gn2
-rw-r--r--ui/ozone/platform/cast/cast.gypi5
5 files changed, 26 insertions, 59 deletions
diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni
index 016374a..57adf10 100644
--- a/chromecast/chromecast.gni
+++ b/chromecast/chromecast.gni
@@ -13,15 +13,6 @@ declare_args() {
# True if Chromecast build is targetted for linux desktop.
is_chromecast_desktop_build = is_linux && target_cpu != "arm"
- # Use the stub graphics lib in //chromecast/graphics. If this is true, the
- # value of |libcast_graphics_path| is ignored.
- use_default_cast_graphics =
- chromecast_branding == "public" || is_chromecast_desktop_build
-
- # The path to the cast_graphics shared library. Any target pointed to must
- # be named "libcast_graphics_1.0".
- libcast_graphics_path = ""
-
# Use Playready CDMs.
use_playready = false
}
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 67aeac1..3356cbf 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -13,7 +13,6 @@
'chromium_code': 1,
'chromecast_branding%': 'public',
'disable_display%': 0,
- 'enable_default_cast_graphics%': 1,
'ozone_platform_cast%': 0,
'use_chromecast_webui%': 0,
},
@@ -506,6 +505,18 @@
},
],
},
+ {
+ 'target_name': 'libcast_graphics_1.0',
+ 'type': 'shared_library',
+ 'dependencies': [
+ 'cast_public_api'
+ ],
+ 'sources': [
+ 'graphics/cast_egl_platform_default.cc',
+ 'graphics/graphics_properties_default.cc',
+ 'graphics/osd_plane_default.cc'
+ ],
+ }
], # end of targets
# Targets for Android receiver.
@@ -741,21 +752,5 @@
},
], # end of targets
}],
- ['enable_default_cast_graphics==1', {
- 'targets': [
- {
- 'target_name': 'libcast_graphics_1.0',
- 'type': 'shared_library',
- 'dependencies': [
- 'cast_public_api'
- ],
- 'sources': [
- 'graphics/cast_egl_platform_default.cc',
- 'graphics/graphics_properties_default.cc',
- 'graphics/osd_plane_default.cc'
- ],
- }
- ]
- }],
], # end of conditions
}
diff --git a/chromecast/graphics/BUILD.gn b/chromecast/graphics/BUILD.gn
index 7ba48c8..66b4d64 100644
--- a/chromecast/graphics/BUILD.gn
+++ b/chromecast/graphics/BUILD.gn
@@ -17,34 +17,18 @@ source_set("graphics") {
]
}
-group("libcast_graphics") {
- if (use_default_cast_graphics) {
- public_deps = [
- ":libcast_graphics_default",
- ]
- } else {
- public_deps = [
- "$libcast_graphics_path:libcast_graphics_1.0",
- ]
- }
-}
-
-if (use_default_cast_graphics) {
- shared_library("libcast_graphics_default") {
- output_name = "libcast_graphics_1.0"
-
- sources = [
- "cast_egl_platform_default.cc",
- "graphics_properties_default.cc",
- "osd_plane_default.cc",
- ]
+shared_library("libcast_graphics_1.0") {
+ sources = [
+ "cast_egl_platform_default.cc",
+ "graphics_properties_default.cc",
+ "osd_plane_default.cc",
+ ]
- public_deps = [
- "//chromecast/public",
- ]
+ public_deps = [
+ "//chromecast/public",
+ ]
- deps = [
- "//base",
- ]
- }
+ deps = [
+ "//base",
+ ]
}
diff --git a/ui/ozone/platform/cast/BUILD.gn b/ui/ozone/platform/cast/BUILD.gn
index 7501477..0f7ab4b 100644
--- a/ui/ozone/platform/cast/BUILD.gn
+++ b/ui/ozone/platform/cast/BUILD.gn
@@ -28,7 +28,7 @@ source_set("cast") {
deps = [
"//base",
"//chromecast/media/base:message_loop",
- "//chromecast/graphics:libcast_graphics",
+ "//chromecast/graphics:libcast_graphics_1.0",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/ozone:ozone_base",
diff --git a/ui/ozone/platform/cast/cast.gypi b/ui/ozone/platform/cast/cast.gypi
index 025e11e..a5a5a88 100644
--- a/ui/ozone/platform/cast/cast.gypi
+++ b/ui/ozone/platform/cast/cast.gypi
@@ -4,8 +4,6 @@
{
'variables': {
- 'cast_graphics_gyp%': '../../chromecast/chromecast.gyp',
- 'libcast_media_gyp%': '../../chromecast/media/media.gyp',
'internal_ozone_platform_deps': [
'ozone_platform_cast',
],
@@ -20,13 +18,12 @@
'target_name': 'ozone_platform_cast',
'type': 'static_library',
'dependencies': [
- '<(cast_graphics_gyp):libcast_graphics_1.0',
- '<(libcast_media_gyp):libcast_media_1.0',
'../events/events.gyp:events',
'../gfx/gfx.gyp:gfx',
'../gfx/gfx.gyp:gfx_geometry',
'../../base/base.gyp:base',
'../../chromecast/chromecast.gyp:cast_public_api',
+ '../../chromecast/chromecast.gyp:libcast_graphics_1.0',
'../../chromecast/media/media.gyp:media_base',
],