Chromium Code Reviews| Index: build/config/linux/BUILD.gn |
| diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn |
| index 3ca2b735f639babd926b278f0277c5707dd2d37b..2963b47aaadcef684b4cf9f30770a812075687ae 100644 |
| --- a/build/config/linux/BUILD.gn |
| +++ b/build/config/linux/BUILD.gn |
| @@ -118,23 +118,14 @@ config("libresolv") { |
| # CrOS doesn't install GTK, gconf or any gnome packages. |
| if (!is_chromeos) { |
| - pkg_config("gtk") { |
| - # Gtk requires gmodule, but it does not list it as a dependency in some |
| - # misconfigured systems. |
| - packages = [ "gmodule-2.0", "gtk+-2.0", "gthread-2.0" ] |
| - } |
| - |
| - pkg_config("gtkprint") { |
| - packages = [ "gtk+-unix-print-2.0" ] |
| - } |
| - |
| - pkg_config("gnome_keyring") { |
| - packages = [ "gnome-keyring-1" ] |
| - } |
| - |
| - pkg_config("gconf") { |
| - packages = [ "gconf-2.0" ] |
| - defines = [ "USE_GCONF" ] |
| + # These packages should _only_ be expected when building for a target. |
| + # If these extra checks are not run, gconf is required when building host |
| + # tools for a CrOS build. |
| + if (current_toolchain == host_toolchain && host_toolchain == default_toolchain) { |
|
jamesr
2014/10/15 22:46:20
let's wrap this at 80col
Chris Masone
2014/10/15 22:52:50
Done.
|
| + pkg_config("gconf") { |
| + packages = [ "gconf-2.0" ] |
| + defines = [ "USE_GCONF" ] |
| + } |
| } |
| } |