Chromium Code Reviews| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 111 | 111 |
| 112 config("libresolv") { | 112 config("libresolv") { |
| 113 libs = [ "resolv" ] | 113 libs = [ "resolv" ] |
| 114 } | 114 } |
| 115 | 115 |
| 116 # CrOS doesn't install GTK, gconf or any gnome packages. | 116 # CrOS doesn't install GTK, gconf or any gnome packages. |
| 117 if (!is_chromeos) { | 117 if (!is_chromeos) { |
| 118 # These packages should _only_ be expected when building for a target. | 118 # These packages should _only_ be expected when building for a target. |
| 119 # If these extra checks are not run, gconf is required when building host | 119 # If these extra checks are not run, gconf is required when building host |
| 120 # tools for a CrOS build. | 120 # tools for a CrOS build. |
| 121 if (current_toolchain == host_toolchain && | 121 if (current_toolchain == default_toolchain) { |
|
Chris Masone
2014/11/04 23:33:16
So, gconf is required only when compiling _target_
brettw
2014/11/04 23:47:52
This is necessary for the 32-bit cross-compile, wh
Chris Masone
2014/11/05 00:53:31
I definitely tried this first, and it didn't work
| |
| 122 host_toolchain == default_toolchain) { | |
| 123 pkg_config("gconf") { | 122 pkg_config("gconf") { |
| 124 packages = [ "gconf-2.0" ] | 123 packages = [ "gconf-2.0" ] |
| 125 defines = [ "USE_GCONF" ] | 124 defines = [ "USE_GCONF" ] |
| 126 } | 125 } |
| 127 } | 126 } |
| 128 } | 127 } |
| 129 | 128 |
| 130 # If brlapi isn't needed, don't require it to be installed. | 129 # If brlapi isn't needed, don't require it to be installed. |
| 131 if (use_brlapi) { | 130 if (use_brlapi) { |
| 132 config("brlapi_config") { | 131 config("brlapi_config") { |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 206 "pci_alloc", | 205 "pci_alloc", |
| 207 "pci_init", | 206 "pci_init", |
| 208 "pci_cleanup", | 207 "pci_cleanup", |
| 209 "pci_scan_bus", | 208 "pci_scan_bus", |
| 210 "pci_fill_info", | 209 "pci_fill_info", |
| 211 "pci_lookup_name", | 210 "pci_lookup_name", |
| 212 ] | 211 ] |
| 213 } | 212 } |
| 214 | 213 |
| 215 # Looking for libspeechd? Use //third_party/speech-dispatcher | 214 # Looking for libspeechd? Use //third_party/speech-dispatcher |
| OLD | NEW |