summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 21:30:51 +0000
committerspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 21:30:51 +0000
commit3bdb0994b4ab7843e1c82289156761a95b4552e5 (patch)
treea1b02a2ecb7001db8844bbeca64e80c19e3a963e
parentcba5e2bee85930e6e6e8730d8a6fb4d98b09f4de (diff)
downloadchromium_src-3bdb0994b4ab7843e1c82289156761a95b4552e5.zip
chromium_src-3bdb0994b4ab7843e1c82289156761a95b4552e5.tar.gz
chromium_src-3bdb0994b4ab7843e1c82289156761a95b4552e5.tar.bz2
ozone: Add ozone_auto_platforms setting
Each time we add a new platform in the default build, products that want only a single platform have to add an entry to GYP_DEFINES to turn it back off. This introduces a new setting, ozone_auto_platforms. If this is turned off in GYP_DEFINES, we'll only build platforms that are explicitly enabled. TEST=runhooks BUG=none Review URL: https://codereview.chromium.org/288273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271101 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/common.gypi38
1 files changed, 25 insertions, 13 deletions
diff --git a/build/common.gypi b/build/common.gypi
index d9f6190..5e524fa 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -561,6 +561,10 @@
# Enable hole punching for the protected video.
'video_hole%': 0,
+ # Automatically select platforms under ozone. Turn this off to
+ # build only explicitly selected platforms.
+ 'ozone_auto_platforms%': 1,
+
'conditions': [
# A flag for POSIX platforms
['OS=="win"', {
@@ -1381,6 +1385,16 @@
# Support ChromeOS touchpad gestures with ozone.
'use_evdev_gestures%': 0,
+ # Default ozone platform (if no --ozone-platform flag).
+ 'ozone_platform%': "",
+
+ # Ozone platforms to include in the build.
+ 'ozone_platform_caca%': 0,
+ 'ozone_platform_dri%': 0,
+ 'ozone_platform_egltest%': 0,
+ 'ozone_platform_ozonex%': 0,
+ 'ozone_platform_test%': 0,
+
'conditions': [
# Enable the Syzygy optimization step for the official builds.
['OS=="win" and buildtype=="Official" and syzyasan!=1', {
@@ -2109,22 +2123,20 @@
'use_brlapi%': 1,
}],
- ['use_ozone==1', {
- # This is the default platform
- 'ozone_platform%': "test",
+ ['use_ozone==1 and ozone_auto_platforms==1', {
+ # Use test as the default platform.
+ 'ozone_platform%': 'test',
- # Enable built-in ozone platforms if ozone is enabled.
- 'ozone_platform_caca%': 0,
+ # Build all platforms whose deps are in install-build-deps.sh.
+ # Only these platforms will be compile tested by buildbots.
'ozone_platform_dri%': 1,
- 'ozone_platform_egltest%': 1,
- 'ozone_platform_ozonex%': 0,
'ozone_platform_test%': 1,
- }, { # use_ozone==0
- 'ozone_platform_caca%': 0,
- 'ozone_platform_dri%': 0,
- 'ozone_platform_egltest%': 0,
- 'ozone_platform_ozonex%': 0,
- 'ozone_platform_test%': 0,
+ 'ozone_platform_egltest%': 1,
+ }],
+
+ ['use_ozone==1 and ozone_auto_platforms==1 and chromeos==1', {
+ # Use dri as the default platform.
+ 'ozone_platform%': 'dri',
}],
['desktop_linux==1 and use_aura==1 and use_x11==1', {