Commit c397c15b authored by cmasone's avatar cmasone Committed by Commit bot

GN: Exclude some packages that are not used on CrOS

Some packages used in linux builds are not used on CrOS, and
indeed are not even installed in the CrOS build chroot. Exclude
them so that the GN build doesn't try to run pkg-config on
packages that aren't installed.

BUG=388412
TEST=Create a target that builds //mojo/public, build with os==chromeos
R=brettw

Review URL: https://codereview.chromium.org/556733002

Cr-Commit-Position: refs/heads/master@{#293977}
parent 84abd166
......@@ -33,16 +33,6 @@ pkg_config("glib") {
packages = [ "glib-2.0", "gmodule-2.0", "gobject-2.0", "gthread-2.0" ]
}
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("pangocairo") {
packages = [ "pangocairo" ]
}
......@@ -61,10 +51,6 @@ pkg_config("dbus") {
packages = [ "dbus-1" ]
}
pkg_config("gnome_keyring") {
packages = [ "gnome-keyring-1" ]
}
if (use_evdev_gestures) {
pkg_config("libevdev-cros") {
packages = [ "libevdev-cros" ]
......@@ -124,9 +110,26 @@ config("libresolv") {
libs = [ "resolv" ]
}
pkg_config("gconf") {
packages = [ "gconf-2.0" ]
defines = [ "USE_GCONF" ]
# 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" ]
}
}
# If brlapi isn't needed, don't require it to be installed.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment