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

Unified Diff: gpu/config/BUILD.gn

Issue 2725873007: gpu/config: Use angle::GetSystemInfo on Linux (Closed)
Patch Set: "Fix" gn check Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/config/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/BUILD.gn
diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn
index b579142188dcd66cbfda91f60dbce0f37f097d73..6debe2edbc50d62634476d7e063d6443b74da663 100644
--- a/gpu/config/BUILD.gn
+++ b/gpu/config/BUILD.gn
@@ -6,12 +6,6 @@ import("//build/config/chrome_build.gni")
import("//build/config/chromecast_build.gni")
import("//build/config/ui.gni")
-declare_args() {
- # Use the PCI lib to collect GPU information on Linux.
- use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) &&
- (use_x11 || use_ozone)
-}
-
group("config") {
if (is_component_build) {
public_deps = [
@@ -55,11 +49,8 @@ source_set("config_sources") {
"gpu_info_collector.h",
"gpu_info_collector_android.cc",
"gpu_info_collector_linux.cc",
- "gpu_info_collector_linux.h",
"gpu_info_collector_mac.mm",
- "gpu_info_collector_ozone.cc",
"gpu_info_collector_win.cc",
- "gpu_info_collector_x11.cc",
"gpu_switches.cc",
"gpu_switches.h",
"gpu_test_config.cc",
@@ -101,29 +92,13 @@ source_set("config_sources") {
]
}
}
+ if (is_linux) {
+ deps += [ "//third_party/angle:angle_gpu_info_util" ]
+ }
if (is_mac) {
libs = [
"IOKit.framework",
"CoreFoundation.framework",
]
}
- if (use_libpci) {
- defines = [ "USE_LIBPCI=1" ]
- deps += [ "//build/linux/libpci" ]
- }
- if (is_linux && use_x11) {
- configs += [
- "//build/config/linux:x11",
- "//build/config/linux:xext",
- ]
- deps += [
- "//third_party/libXNVCtrl",
- "//ui/gfx/x",
- ]
- } else {
- sources -= [ "gpu_info_collector_x11.cc" ]
- }
- if (!use_ozone) {
- sources -= [ "gpu_info_collector_ozone.cc" ]
- }
}
« no previous file with comments | « no previous file | gpu/config/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698