diff options
| author | slan <slan@chromium.org> | 2015-12-10 12:59:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 21:01:31 +0000 |
| commit | 338b33716c8ffb1f171e4a5ca032ac7ea4cefeb2 (patch) | |
| tree | df7b7fe048e0452f47553583220390c56b860d6d | |
| parent | 5c11f1846badc760e279ad4a7907cc8e45b92fa9 (diff) | |
| download | chromium_src-338b33716c8ffb1f171e4a5ca032ac7ea4cefeb2.zip chromium_src-338b33716c8ffb1f171e4a5ca032ac7ea4cefeb2.tar.gz chromium_src-338b33716c8ffb1f171e4a5ca032ac7ea4cefeb2.tar.bz2 | |
[Chromecast] Set default ozone platform to "cast" on device builds.
All device Chromecast builds should default to "cast" platform. Desktop
builds will continue to use "headless" as default for now.
BUG=
Review URL: https://codereview.chromium.org/1519613002
Cr-Commit-Position: refs/heads/master@{#364472}
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | ui/ozone/ozone.gni | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index c9f8290..b81acbe 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2386,10 +2386,18 @@ ['disable_display==0', { # Enable the Cast ozone platform on all A/V Cast builds. 'ozone_platform_cast%': 1, + + # For desktop Chromecast builds, override the default "headless" + # platform with --ozone-platform=egltest + # TODO(slan|halliwell): Make the default platform "cast" on + # desktop too. 'conditions': [ ['OS=="linux" and target_arch!="arm"', { 'ozone_platform_egltest%': 1, 'ozone_platform_ozonex%': 1, + }, { + # On device builds, enable "cast" as the default platform. + 'ozone_platform%': 'cast', }], ], }], diff --git a/ui/ozone/ozone.gni b/ui/ozone/ozone.gni index f8c0186..05994bd 100644 --- a/ui/ozone/ozone.gni +++ b/ui/ozone/ozone.gni @@ -35,13 +35,18 @@ declare_args() { if (is_chromecast) { if (!disable_display) { + # Enable the Cast ozone platform on all A/V Cast builds. ozone_platform_cast = true - # For desktop Chromecast builds, override the default "headless" platform - # with --ozone-platform=egltest + # For desktop Chromecast builds, override the default "headless" + # platform with --ozone-platform=egltest + # TODO(slan|halliwell): Make the default platform "cast" on desktop too. if (target_os == "linux" && target_cpu != "arm") { ozone_platform_egltest = true ozone_platform_ozonex = true + } else { + # On device builds, enable "cast" as the default platform. + ozone_platform = "cast" } } } else if (is_chromeos) { |