| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/linux/pkg_config.gni") | 5 import("//build/config/linux/pkg_config.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/sysroot.gni") | 7 import("//build/config/sysroot.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//tools/generate_library_loader/generate_library_loader.gni") | 9 import("//tools/generate_library_loader/generate_library_loader.gni") |
| 10 | 10 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 pkg_config("gio_config") { | 165 pkg_config("gio_config") { |
| 166 packages = [ "gio-2.0" ] | 166 packages = [ "gio-2.0" ] |
| 167 # glib >=2.40 deprecate g_settings_list_schemas in favor of | 167 # glib >=2.40 deprecate g_settings_list_schemas in favor of |
| 168 # g_settings_schema_source_list_schemas. This function is not available on | 168 # g_settings_schema_source_list_schemas. This function is not available on |
| 169 # earlier versions that we still need to support (specifically, 2.32), so | 169 # earlier versions that we still need to support (specifically, 2.32), so |
| 170 # disable the warning with the GLIB_DISABLE_DEPRECATION_WARNINGS define. | 170 # disable the warning with the GLIB_DISABLE_DEPRECATION_WARNINGS define. |
| 171 # TODO(mgiuca): Remove this suppression when we drop support for Ubuntu 13.10 | 171 # TODO(mgiuca): Remove this suppression when we drop support for Ubuntu 13.10 |
| 172 # (saucy) and earlier. Update the code to use | 172 # (saucy) and earlier. Update the code to use |
| 173 # g_settings_schema_source_list_schemas instead. | 173 # g_settings_schema_source_list_schemas instead. |
| 174 defines = [ "USE_GIO", "GLIB_DISABLE_DEPRECATION_WARNINGS" ] | 174 defines = [ "USE_GIO", "GLIB_DISABLE_DEPRECATION_WARNINGS" ] |
| 175 ignore_libs = true # Loader generated below. | 175 |
| 176 # TODO(brettw) Theoretically I think ignore_libs should be set so that we |
| 177 # don't link directly to GIO and use the loader generated below. But the gio |
| 178 # target in GYP doesn't make any sense to me and appears to link directly to |
| 179 # GIO in addition to making a loader. This this uncommented, the link in |
| 180 # component build fails, so I think this is closer to the GYP build. |
| 181 #ignore_libs = true # Loader generated below. |
| 176 } | 182 } |
| 177 | 183 |
| 178 # This generates a target named "gio". | 184 # This generates a target named "gio". |
| 179 generate_library_loader("gio") { | 185 generate_library_loader("gio") { |
| 180 name = "LibGioLoader" | 186 name = "LibGioLoader" |
| 181 output_h = "libgio.h" | 187 output_h = "libgio.h" |
| 182 output_cc = "libgio_loader.cc" | 188 output_cc = "libgio_loader.cc" |
| 183 header = "<gio/gio.h>" | 189 header = "<gio/gio.h>" |
| 184 config = ":gio_config" | 190 config = ":gio_config" |
| 185 | 191 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 205 "pci_alloc", | 211 "pci_alloc", |
| 206 "pci_init", | 212 "pci_init", |
| 207 "pci_cleanup", | 213 "pci_cleanup", |
| 208 "pci_scan_bus", | 214 "pci_scan_bus", |
| 209 "pci_fill_info", | 215 "pci_fill_info", |
| 210 "pci_lookup_name", | 216 "pci_lookup_name", |
| 211 ] | 217 ] |
| 212 } | 218 } |
| 213 | 219 |
| 214 # Looking for libspeechd? Use //third_party/speech-dispatcher | 220 # Looking for libspeechd? Use //third_party/speech-dispatcher |
| OLD | NEW |