Import Mojo Changes

build/config/ui.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file contains UI-related build flags. It should theoretically be in the
 # src/ui directory and only things that depend on the ui module should get the
 # definitions.
 #
 # However, today we have many "bad" dependencies on some of these flags from,
 # e.g. base, so they need to be global.
@@ skipping 11 matching lines @@
 
   # Support ChromeOS touchpad gestures with ozone.
   use_evdev_gestures = false
 
   # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
   # of a replacement for GDI or GTK.
   use_aura = is_win || is_linux
 
   # True means the UI is built using the "views" framework.
   toolkit_views = is_win || is_chromeos || use_aura
+
+  # Whether we should use glib, a low level C utility library.
+  use_glib = is_linux && !use_ozone
 }
 
 # Additional dependent variables -----------------------------------------------
 #
 # These variables depend on other variables and can't be set externally.
 
-if (is_linux) {
+if (is_linux && use_glib) {
   use_cairo = true
   use_pango = true
 } else {
   use_cairo = false
   use_pango = false
 }
 
 # 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
 
 use_default_render_theme = use_aura || is_linux
 
 # Indicates if the UI toolkit depends on X11.
 use_x11 = is_linux && !use_ozone
 
 use_ozone_evdev = use_ozone
 
-use_glib = is_linux && !use_ozone

[scottmg, 2015/01/20 18:09:51]

could it be "&& some_condition" down here instead of making it yet-another arg
to be configured?

[Elliot Glaysher, 2015/01/20 18:14:13]

I don't know how I'd do that. This file is copied directly into the mojo
repository (to support a bunch of copied chrome code), and there doesn't appear
to be a we_are_building_chrome_code_out_of_the_chrome_repo flag.

[scottmg, 2015/01/20 18:16:36]

OK. I meant more checking whatever it is that's not using glib now. But I guess
it's just "new UI that doesn't need it any more"?

-
 use_clipboard_aurax11 = is_linux && use_aura && use_x11
 
 use_athena = false
 
 enable_hidpi = is_mac || is_chromeos || is_win