diff options
| author | halliwell <halliwell@chromium.org> | 2015-04-30 12:34:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-30 19:35:21 +0000 |
| commit | cecbc92a17adfcf2394e36dbc62fb756ccad7416 (patch) | |
| tree | e08a2919b1a412d9ce515407f871115f7cbf2583 /chromecast | |
| parent | a34ed2181eb8d7db3fc35f9bead91bbea87e255c (diff) | |
| download | chromium_src-cecbc92a17adfcf2394e36dbc62fb756ccad7416.zip chromium_src-cecbc92a17adfcf2394e36dbc62fb756ccad7416.tar.gz chromium_src-cecbc92a17adfcf2394e36dbc62fb756ccad7416.tar.bz2 | |
Fixes Cast dependency on eglplatform_shim_x11
Original logic was:
If internal build
Depend on cast_gfx_internal target:
If ozone platform is egltest
cast_gfx_internal depended on eglplatform_shim_x11
Else
Depend on eglplatform_shim_x11
cast_gfx_internal dependency was recently removed:
https://codereview.chromium.org/1104853002/
It still gets pulled in by other downstream dependencies, but I'm
removing those (and the target entirely) which means internal clang
builds are losing the dependency on eglplatform_shim_x11.
This change restores the dependency when we need it.
BUG=
Review URL: https://codereview.chromium.org/1110033006
Cr-Commit-Position: refs/heads/master@{#327764}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/chromecast.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp index f882b8a..8cae376 100644 --- a/chromecast/chromecast.gyp +++ b/chromecast/chromecast.gyp @@ -590,7 +590,7 @@ 'media/media.gyp:cast_media', ], 'conditions': [ - ['chromecast_branding!="Chrome"', { + ['ozone_platform=="egltest"', { 'dependencies': [ '../ui/ozone/ozone.gyp:eglplatform_shim_x11', ], |