Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1695)

Unified Diff: build/config/ui.gni

Issue 1415153007: build: Allow glib to be disabled for non-ozone builds of chromium when using GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ui.gni
diff --git a/build/config/ui.gni b/build/config/ui.gni
index f7070bbf46af9103f4c96ffe239ad423e521e748..a5c038265e2b933a48acaa909e8911d14de36712 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -42,6 +42,9 @@ declare_args() {
# Optional system libraries.
use_xkbcommon = false
+
+ # Whether we should use glib, a low level C utility library.
+ use_glib = is_linux && !use_ozone
Dirk Pranke 2015/11/05 22:19:21 This change probably doesn't do what you expect it
reveman 2015/11/05 23:15:07 ah, got it.
}
# Additional dependent variables -----------------------------------------------
@@ -57,10 +60,7 @@ use_default_render_theme = use_aura && !is_android
# Indicates if the UI toolkit depends on X11.
use_x11 = is_linux && !use_ozone
-# Whether we should use glib, a low level C utility library.
-use_glib = is_linux && !use_ozone
-
-if (is_linux && use_glib) {
+if (is_linux && !use_ozone) {
Dirk Pranke 2015/11/05 22:19:21 I'm not sure I understand this change. Are you say
reveman 2015/11/05 23:15:07 Yes, use_glib should not affect this. A non-ozone
use_cairo = true
use_pango = true
} else {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698