net/BUILD.gn - Issue 1398473005: be more explicit about gconf and glib conditions in net/BUILD.gn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/BUILD.gn

Issue 1398473005: be more explicit about gconf and glib conditions in net/BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 months 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

Index: net/BUILD.gn

diff --git a/net/BUILD.gn b/net/BUILD.gn

index 00756332bec1c1171ad47067ff82a677eed996f1..5eb0661d007fb4d4d82c128a85599745bda8b17e 100644

--- a/net/BUILD.gn

+++ b/net/BUILD.gn

@@ -240,7 +240,7 @@ if (!is_nacl) {

}

- if (use_glib && !is_chromeos) {

+ if (use_glib && use_gconf && !is_chromeos) {

net_shared_configs += [ "//build/config/linux:gconf" ]

net_shared_deps += [ "//build/linux:gio" ]

}

@@ -959,7 +959,7 @@ if (!is_ios && !is_android) {

"//build/config/sanitizers:deps",

]

- if (is_desktop_linux && use_gconf) {

+ if (is_desktop_linux && use_gconf && use_glib) {

configs += [

"//build/config/linux:gconf",

"//build/config/linux:glib",

« no previous file with comments | « no previous file | no next file » | no next file with comments »