Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(711)

Side by Side Diff: gpu/config/BUILD.gn

Issue 692893004: Provide a way to disable libpci dependency. (Closed) Base URL: git://nuxepg2.fr.nds.com/CHROM/chromium-src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/linux/system.gyp ('k') | gpu/config/gpu_info_collector_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 source_set("config") { 7 source_set("config") {
8 sources = [ 8 sources = [
9 "dx_diag_node.cc", 9 "dx_diag_node.cc",
10 "dx_diag_node.h", 10 "dx_diag_node.h",
(...skipping 30 matching lines...) Expand all
41 ] 41 ]
42 42
43 defines = [ "GPU_IMPLEMENTATION" ] 43 defines = [ "GPU_IMPLEMENTATION" ]
44 44
45 deps = [ 45 deps = [
46 "//base", 46 "//base",
47 "//third_party/re2", 47 "//third_party/re2",
48 "//ui/gl", 48 "//ui/gl",
49 ] 49 ]
50 50
51 # Use the PCI lib to collect GPU information on Linux.
52 use_libpci = true
piman 2014/10/31 18:29:28 Should this be in a declare_args() block so that y
brettw 2014/10/31 19:20:06 Yes, what you did here will always disable pci.
53
51 # Prefer mesa GL headers to system headers, which cause problems on Win. 54 # Prefer mesa GL headers to system headers, which cause problems on Win.
52 include_dirs = [ "//third_party/mesa/src/include" ] 55 include_dirs = [ "//third_party/mesa/src/include" ]
53 56
54 if (is_win) { 57 if (is_win) {
55 deps += [ "//third_party/libxml" ] 58 deps += [ "//third_party/libxml" ]
56 libs = [ "dxguid.lib", "setupapi.lib" ] 59 libs = [ "dxguid.lib", "setupapi.lib" ]
57 60
58 if (is_chrome_branded && is_official_build) { 61 if (is_chrome_branded && is_official_build) {
59 sources += [ 62 sources += [
60 "//third_party/amd/AmdCfxPxExt.h", 63 "//third_party/amd/AmdCfxPxExt.h",
61 "//third_party/amd/amd_videocard_info_win.cc", 64 "//third_party/amd/amd_videocard_info_win.cc",
62 ] 65 ]
63 } 66 }
64 } 67 }
65 if (is_linux && (use_x11 || use_ozone)) { 68 if (use_libpci) {
69 defines += [ "USE_LIBPCI=1" ]
70 }
71 if (is_linux && use_libpci && (use_x11 || use_ozone)) {
66 deps += [ 72 deps += [
67 "//build/config/linux:libpci", 73 "//build/config/linux:libpci",
68 ] 74 ]
69 } 75 }
70 if (is_linux && use_x11) { 76 if (is_linux && use_x11) {
71 configs += [ 77 configs += [
72 "//build/config/linux:x11", 78 "//build/config/linux:x11",
73 "//build/config/linux:xext", 79 "//build/config/linux:xext",
74 ] 80 ]
75 deps += [ 81 deps += [
76 "//third_party/libXNVCtrl", 82 "//third_party/libXNVCtrl",
77 ] 83 ]
78 } else { 84 } else {
79 sources -= [ "gpu_info_collector_x11.cc" ] 85 sources -= [ "gpu_info_collector_x11.cc" ]
80 } 86 }
81 if (!use_ozone) { 87 if (!use_ozone) {
82 sources -= [ "gpu_info_collector_ozone.cc" ] 88 sources -= [ "gpu_info_collector_ozone.cc" ]
83 } 89 }
84 } 90 }
85 91
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | gpu/config/gpu_info_collector_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698