diff options
| author | erg <erg@chromium.org> | 2015-01-20 12:25:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-20 20:26:45 +0000 |
| commit | 9252aff86f89f9ae0293a81b46097b1b51a6b553 (patch) | |
| tree | c4ac23085cdbc50c907a4058486649ce7ac66176 /build | |
| parent | a25933cbe537584b534f7e312f33932506b9d1aa (diff) | |
| download | chromium_src-9252aff86f89f9ae0293a81b46097b1b51a6b553.zip chromium_src-9252aff86f89f9ae0293a81b46097b1b51a6b553.tar.gz chromium_src-9252aff86f89f9ae0293a81b46097b1b51a6b553.tar.bz2 | |
Make |use_glib| configurable.
This is needed for mojo. We're trying to remove glib and dbus from our build, and need to be able to configure this option. This will be rolled back into the mojo repository.
This was split from the mojo patch: https://codereview.chromium.org/853133002/
BUG=443439
Review URL: https://codereview.chromium.org/853103004
Cr-Commit-Position: refs/heads/master@{#312261}
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/ui.gni | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/config/ui.gni b/build/config/ui.gni index dc7a059..72303ac 100644 --- a/build/config/ui.gni +++ b/build/config/ui.gni @@ -29,13 +29,16 @@ declare_args() { # 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 { @@ -54,8 +57,6 @@ use_x11 = is_linux && !use_ozone use_ozone_evdev = use_ozone -use_glib = is_linux && !use_ozone - use_clipboard_aurax11 = is_linux && use_aura && use_x11 use_athena = false |