diff options
| author | mostynb <mostynb@opera.com> | 2015-10-21 00:53:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 07:54:17 +0000 |
| commit | bf5e6cc276b5dc1b1a43e2c59deadb4dc060b5ed (patch) | |
| tree | b3560a016044e20f7109e45e6619376c84c3f406 /net/BUILD.gn | |
| parent | 0fbb02dc39e4da03f5901f5b6ef7f3d15c1cbd22 (diff) | |
| download | chromium_src-bf5e6cc276b5dc1b1a43e2c59deadb4dc060b5ed.zip chromium_src-bf5e6cc276b5dc1b1a43e2c59deadb4dc060b5ed.tar.gz chromium_src-bf5e6cc276b5dc1b1a43e2c59deadb4dc060b5ed.tar.bz2 | |
be more explicit about gconf and glib conditions in net/BUILD.gn
BUG=512899,516899
Review URL: https://codereview.chromium.org/1398473005
Cr-Commit-Position: refs/heads/master@{#355257}
Diffstat (limited to 'net/BUILD.gn')
| -rw-r--r-- | net/BUILD.gn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn index 319e1e7..1d20375 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", |