summaryrefslogtreecommitdiffstats
path: root/ui/ozone/ozone.gni
diff options
context:
space:
mode:
authorslan <slan@chromium.org>2015-09-24 12:42:50 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-24 19:43:42 +0000
commitfc8c6ebb30e4557df7cb09adeab8ade72a36a4d3 (patch)
tree26ef494543aca2dbc35e4cb9e4a729c6c316dfcb /ui/ozone/ozone.gni
parente9a4c96d5912a9179bb7ba45c34272d456fce762 (diff)
downloadchromium_src-fc8c6ebb30e4557df7cb09adeab8ade72a36a4d3.zip
chromium_src-fc8c6ebb30e4557df7cb09adeab8ade72a36a4d3.tar.gz
chromium_src-fc8c6ebb30e4557df7cb09adeab8ade72a36a4d3.tar.bz2
[Chromecast] Disable use_xkbcommon, change ozone platforms for Cast.
Change use_xkbcommon to guard all files which use its headers. This is more specific than use_ozone, which does not apply to ozone_platform_cast. Also excludes ozone_plaftorm_{egl_test|ozonex} from Chromecast ARM builds. Bug=516899 BUG= Review URL: https://codereview.chromium.org/1367833002 Cr-Commit-Position: refs/heads/master@{#350617}
Diffstat (limited to 'ui/ozone/ozone.gni')
-rw-r--r--ui/ozone/ozone.gni10
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/ozone/ozone.gni b/ui/ozone/ozone.gni
index 74d7aa2..e36b1d1 100644
--- a/ui/ozone/ozone.gni
+++ b/ui/ozone/ozone.gni
@@ -25,13 +25,15 @@ declare_args() {
if (is_chromecast) {
# The default platform used at runtime is "cast".
ozone_platform = "cast"
+ ozone_platform_cast = true
+ ozone_platform_test = true
# For desktop Chromecast builds, override the default "cast" platform with
# --ozone_platform=egltest
- ozone_platform_cast = true
- ozone_platform_egltest = true
- ozone_platform_ozonex = true
- ozone_platform_test = true
+ if (target_os == "linux" && target_cpu != "arm") {
+ ozone_platform_egltest = true
+ ozone_platform_ozonex = true
+ }
} else {
# Use test as the default platform.
ozone_platform = "test"