Ozone X11 platform

build/config/ui.gni

Index: build/config/ui.gni
diff --git a/build/config/ui.gni b/build/config/ui.gni
index dc7a05905d7f085e525d10754b5b4d3e804b075f..892cc6c5da4865da25b7dbdb3a9c6b453ee0b051 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -20,6 +20,9 @@ declare_args() {
   # that does not require X11.
   use_ozone = false
 
+  # Indicates if Ozone should use X11.
+  use_ozone_x11 = false
+
   # Support ChromeOS touchpad gestures with ozone.
   use_evdev_gestures = false
 
@@ -43,6 +46,10 @@ if (is_linux) {
   use_pango = false
 }
 
+if (use_ozone_x11) {
+  use_ozone = true
+}
+
 # Use GPU accelerated cross process image transport by default on linux builds
 # with the Aura window manager.
 ui_compositor_image_transport = use_aura && is_linux
@@ -50,9 +57,12 @@ ui_compositor_image_transport = use_aura && is_linux
 use_default_render_theme = use_aura || is_linux
 
 # Indicates if the UI toolkit depends on X11.
+# use_x11 specifies if the entire system uses X11-specific code, use_x11_backend
+# specifies if X11 is used as a backend even if use_x11 is off.
 use_x11 = is_linux && !use_ozone
+use_x11_backend = use_x11 || (is_linux && use_ozone && use_ozone_x11)
 
-use_ozone_evdev = use_ozone
+use_ozone_evdev = use_ozone && !use_ozone_x11

[spang, 2014/11/24 18:56:54]

shouldn't disable evdev if x11 is set

[achaulk, 2014/11/24 19:28:39]

Why not? I guess it doesn't matter either way, but that config doesn't make any
sense

[spang, 2014/11/24 20:04:24]

It does make sense. All of the existing platforms can be part of the same build,
and x11 should too.

The buildbots should do a build like

  use_ozone = true
  ozone_platform_test = true
  ozone_platform_dri = true
  ozone_platform_x11 = true

  // caca example is currently off because it is not installed on the builders
  // gbm is currently off due to library versioning issues

.. so that they compile test as much as possible.

[achaulk, 2014/11/24 20:16:26]

Oh just for sanity checking? It would link against X libraries so you couldn't
use these builds on devices without X libs in place, so I figured this would be
built separately

 
 use_glib = is_linux && !use_ozone