diff options
| author | dnicoara <dnicoara@chromium.org> | 2015-12-01 13:14:23 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 21:15:23 +0000 |
| commit | 788eaa142aaf2187981ebaf954f8efe9fce77eb5 (patch) | |
| tree | b3cf6a8d779636bedddb74b213354828fcb70416 | |
| parent | b6aa1c6d2c6b9161828bd6bbe8231647ed233836 (diff) | |
| download | chromium_src-788eaa142aaf2187981ebaf954f8efe9fce77eb5.zip chromium_src-788eaa142aaf2187981ebaf954f8efe9fce77eb5.tar.gz chromium_src-788eaa142aaf2187981ebaf954f8efe9fce77eb5.tar.bz2 | |
Disable compiling GBM Ozone platform on non-ChromeOS
The sysroot used to build content_shell on the ECS bot (non-chromeos) is
old and doesn't have all the needed functions in libdrm. Thus, disable
compiling of GBM on desktop builds and rely on the ChromiumOS builders
to test that platform.
BUG=559708
Review URL: https://codereview.chromium.org/1485613005
Cr-Commit-Position: refs/heads/master@{#362499}
| -rw-r--r-- | build/common.gypi | 16 | ||||
| -rw-r--r-- | ui/ozone/ozone.gni | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4dad56f..f7ff443 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2391,11 +2391,17 @@ ], }], ], - }, { - # Build all platforms whose deps are in install-build-deps.sh. - # Only these platforms will be compile tested by buildbots. - 'ozone_platform_gbm%': 1, - 'ozone_platform_egltest%': 1, + }, { # chromecast!=1 + 'conditions': [ + ['OS=="chromeos"', { + 'ozone_platform_gbm%': 1, + 'ozone_platform_egltest%': 1, + }, { + # Build all platforms whose deps are in install-build-deps.sh. + # Only these platforms will be compile tested by buildbots. + 'ozone_platform_egltest%': 1, + }], + ], }], ], }], diff --git a/ui/ozone/ozone.gni b/ui/ozone/ozone.gni index 8e33f80..f8c0186 100644 --- a/ui/ozone/ozone.gni +++ b/ui/ozone/ozone.gni @@ -44,10 +44,12 @@ declare_args() { ozone_platform_ozonex = true } } + } else if (is_chromeos) { + ozone_platform_gbm = true + ozone_platform_egltest = true } else { # Build all platforms whose deps are in install-build-deps.sh. # Only these platforms will be compile tested by buildbots. - ozone_platform_gbm = true ozone_platform_egltest = true } } |