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

Unified Diff: build/config/linux/BUILD.gn

Issue 655343002: GN: Move configs for single-use Linux packages close to usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: is_linux -> is_desktop_linux Created 6 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
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/linux/BUILD.gn
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
index 3ca2b735f639babd926b278f0277c5707dd2d37b..559dfd93a73461f440ab53e04213f3efaf6ac83a 100644
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -118,23 +118,15 @@ 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) {
+ pkg_config("gconf") {
+ packages = [ "gconf-2.0" ]
+ defines = [ "USE_GCONF" ]
+ }
}
}
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698