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

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

Issue 843583006: GN: Add -Wl,-z defs on linux and fix errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months 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
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 declare_args() { 7 declare_args() {
8 # Use the PCI lib to collect GPU information on Linux. 8 # Use the PCI lib to collect GPU information on Linux.
9 use_libpci = true 9 use_libpci = true
10 } 10 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 defines += [ "USE_LIBPCI=1" ] 77 defines += [ "USE_LIBPCI=1" ]
78 } 78 }
79 if (is_linux && use_libpci && (use_x11 || use_ozone)) { 79 if (is_linux && use_libpci && (use_x11 || use_ozone)) {
80 deps += [ "//build/config/linux:libpci" ] 80 deps += [ "//build/config/linux:libpci" ]
81 } 81 }
82 if (is_linux && use_x11) { 82 if (is_linux && use_x11) {
83 configs += [ 83 configs += [
84 "//build/config/linux:x11", 84 "//build/config/linux:x11",
85 "//build/config/linux:xext", 85 "//build/config/linux:xext",
86 ] 86 ]
87 deps += [ "//third_party/libXNVCtrl" ] 87 deps += [
88 "//third_party/libXNVCtrl",
89 "//ui/gfx/x/",
Nico 2015/01/15 23:35:07 no trailing / (?)
jamesr 2015/01/16 02:00:45 Done.
90 ]
88 } else { 91 } else {
89 sources -= [ "gpu_info_collector_x11.cc" ] 92 sources -= [ "gpu_info_collector_x11.cc" ]
90 } 93 }
91 if (!use_ozone) { 94 if (!use_ozone) {
92 sources -= [ "gpu_info_collector_ozone.cc" ] 95 sources -= [ "gpu_info_collector_ozone.cc" ]
93 } 96 }
94 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698