| Index: build/config/linux/BUILD.gn
|
| diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
|
| index 660458850475abb9050112253abd5ae571615341..6a9a2ffe58b0f33fd79c1b0fbca2afc1b4fdab50 100644
|
| --- a/build/config/linux/BUILD.gn
|
| +++ b/build/config/linux/BUILD.gn
|
| @@ -8,11 +8,6 @@ import("//build/config/sysroot.gni")
|
| import("//build/config/ui.gni")
|
| import("//tools/generate_library_loader/generate_library_loader.gni")
|
|
|
| -gypi_values = exec_script("//build/gypi_to_gn.py",
|
| - [ rebase_path("../../linux/system.gyp") ],
|
| - "scope",
|
| - [ "../../linux/system.gyp" ])
|
| -
|
| config("sdk") {
|
| if (sysroot != "") {
|
| cflags = [ "--sysroot=" + sysroot ]
|
| @@ -43,30 +38,6 @@ pkg_config("freetype2") {
|
| packages = [ "freetype2" ]
|
| }
|
|
|
| -pkg_config("pangocairo") {
|
| - packages = [ "pangocairo" ]
|
| -}
|
| -
|
| -pkg_config("pangoft2") {
|
| - packages = [ "pangoft2" ]
|
| -}
|
| -
|
| -# Note: if your target also depends on //dbus, you don't need to add this
|
| -# config (it will get added automatically if you depend on //dbus).
|
| -pkg_config("dbus") {
|
| - packages = [ "dbus-1" ]
|
| -}
|
| -
|
| -if (use_evdev_gestures) {
|
| - pkg_config("libevdev-cros") {
|
| - packages = [ "libevdev-cros" ]
|
| - }
|
| -
|
| - pkg_config("libgestures") {
|
| - packages = [ "libgestures" ]
|
| - }
|
| -}
|
| -
|
| config("x11") {
|
| libs = [
|
| "X11",
|
| @@ -90,42 +61,6 @@ config("libresolv") {
|
| libs = [ "resolv" ]
|
| }
|
|
|
| -pkg_config("gio_config") {
|
| - packages = [ "gio-2.0" ]
|
| -
|
| - # glib >=2.40 deprecate g_settings_list_schemas in favor of
|
| - # g_settings_schema_source_list_schemas. This function is not available on
|
| - # earlier versions that we still need to support (specifically, 2.32), so
|
| - # disable the warning with the GLIB_DISABLE_DEPRECATION_WARNINGS define.
|
| - # TODO(mgiuca): Remove this suppression when we drop support for Ubuntu 13.10
|
| - # (saucy) and earlier. Update the code to use
|
| - # g_settings_schema_source_list_schemas instead.
|
| - defines = [
|
| - "USE_GIO",
|
| - "GLIB_DISABLE_DEPRECATION_WARNINGS",
|
| - ]
|
| -
|
| - # TODO(brettw) Theoretically I think ignore_libs should be set so that we
|
| - # don't link directly to GIO and use the loader generated below. But the gio
|
| - # target in GYP doesn't make any sense to me and appears to link directly to
|
| - # GIO in addition to making a loader. This this uncommented, the link in
|
| - # component build fails, so I think this is closer to the GYP build.
|
| - #ignore_libs = true # Loader generated below.
|
| -}
|
| -
|
| -if (is_desktop_linux) {
|
| - # This generates a target named "gio".
|
| - generate_library_loader("gio") {
|
| - name = "LibGioLoader"
|
| - output_h = "libgio.h"
|
| - output_cc = "libgio_loader.cc"
|
| - header = "<gio/gio.h>"
|
| - config = ":gio_config"
|
| -
|
| - functions = gypi_values.libgio_functions
|
| - }
|
| -}
|
| -
|
| # This generates a target named "libpci".
|
| generate_library_loader("libpci") {
|
| name = "LibPciLoader"
|
| @@ -133,10 +68,48 @@ generate_library_loader("libpci") {
|
| output_cc = "libpci_loader.cc"
|
| header = "<pci/pci.h>"
|
|
|
| - functions = gypi_values.libpci_functions
|
| + functions = [
|
| + "pci_alloc",
|
| + "pci_init",
|
| + "pci_cleanup",
|
| + "pci_scan_bus",
|
| + "pci_fill_info",
|
| + "pci_lookup_name",
|
| + ]
|
| }
|
|
|
| -# Looking for libspeechd? Use //third_party/speech-dispatcher
|
| +libudev_functions = [
|
| + "udev_device_get_action",
|
| + "udev_device_get_devnode",
|
| + "udev_device_get_parent",
|
| + "udev_device_get_parent_with_subsystem_devtype",
|
| + "udev_device_get_property_value",
|
| + "udev_device_get_subsystem",
|
| + "udev_device_get_sysattr_value",
|
| + "udev_device_get_sysname",
|
| + "udev_device_get_syspath",
|
| + "udev_device_new_from_devnum",
|
| + "udev_device_new_from_subsystem_sysname",
|
| + "udev_device_new_from_syspath",
|
| + "udev_device_unref",
|
| + "udev_enumerate_add_match_subsystem",
|
| + "udev_enumerate_get_list_entry",
|
| + "udev_enumerate_new",
|
| + "udev_enumerate_scan_devices",
|
| + "udev_enumerate_unref",
|
| + "udev_list_entry_get_next",
|
| + "udev_list_entry_get_name",
|
| + "udev_monitor_enable_receiving",
|
| + "udev_monitor_filter_add_match_subsystem_devtype",
|
| + "udev_monitor_get_fd",
|
| + "udev_monitor_new_from_netlink",
|
| + "udev_monitor_receive_device",
|
| + "udev_monitor_unref",
|
| + "udev_new",
|
| + "udev_set_log_fn",
|
| + "udev_set_log_priority",
|
| + "udev_unref",
|
| +]
|
|
|
| # This generates a target named "udev0_loader".
|
| generate_library_loader("udev0_loader") {
|
| @@ -145,7 +118,7 @@ generate_library_loader("udev0_loader") {
|
| output_cc = "libudev0_loader.cc"
|
| header = "\"third_party/libudev/libudev0.h\""
|
|
|
| - functions = gypi_values.libudev_functions
|
| + functions = libudev_functions
|
| }
|
|
|
| # This generates a target named "udev1_loader".
|
| @@ -155,7 +128,7 @@ generate_library_loader("udev1_loader") {
|
| output_cc = "libudev1_loader.cc"
|
| header = "\"third_party/libudev/libudev1.h\""
|
|
|
| - functions = gypi_values.libudev_functions
|
| + functions = libudev_functions
|
| }
|
|
|
| group("udev") {
|
|
|