Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / build / config / linux / BUILD.gn

diff --git a/src/build/config/linux/BUILD.gn b/src/build/config/linux/BUILD.gn
index 3ca2b73..758f42a 100644 (file)
--- a/src/build/config/linux/BUILD.gn
+++ b/src/build/config/linux/BUILD.gn
@@ -68,8 +68,6 @@ if (use_evdev_gestures) {
 }
 
 config("x11") {
-  # Don't bother running pkg-config for these X related libraries since it just
-  # returns the same libs, and forking pkg-config is slow.
   libs = [
     "X11",
     "Xcomposite",
@@ -79,7 +77,6 @@ config("x11") {
     "Xfixes",
     "Xi",
     "Xrender",
-    "Xss",
     "Xtst",
   ]
 }
@@ -118,23 +115,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 == default_toolchain) {
+    pkg_config("gconf") {
+      packages = [ "gconf-2.0" ]
+      defines = [ "USE_GCONF" ]
+    }
   }
 }