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

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

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zmo nits Created 5 years, 7 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
« no previous file with comments | « gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc ('k') | gpu/config/gpu_switches.h » ('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 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 "gpu_info.h", 42 "gpu_info.h",
43 "gpu_info_collector.cc", 43 "gpu_info_collector.cc",
44 "gpu_info_collector.h", 44 "gpu_info_collector.h",
45 "gpu_info_collector_android.cc", 45 "gpu_info_collector_android.cc",
46 "gpu_info_collector_linux.cc", 46 "gpu_info_collector_linux.cc",
47 "gpu_info_collector_linux.h", 47 "gpu_info_collector_linux.h",
48 "gpu_info_collector_mac.mm", 48 "gpu_info_collector_mac.mm",
49 "gpu_info_collector_ozone.cc", 49 "gpu_info_collector_ozone.cc",
50 "gpu_info_collector_win.cc", 50 "gpu_info_collector_win.cc",
51 "gpu_info_collector_x11.cc", 51 "gpu_info_collector_x11.cc",
52 "gpu_switches.cc",
53 "gpu_switches.h",
52 "gpu_test_config.cc", 54 "gpu_test_config.cc",
53 "gpu_test_config.h", 55 "gpu_test_config.h",
54 "gpu_test_expectations_parser.cc", 56 "gpu_test_expectations_parser.cc",
55 "gpu_test_expectations_parser.h", 57 "gpu_test_expectations_parser.h",
56 "gpu_util.cc", 58 "gpu_util.cc",
57 "gpu_util.h", 59 "gpu_util.h",
58 "software_rendering_list_json.cc", 60 "software_rendering_list_json.cc",
59 ] 61 ]
60 62
61 configs += [ 63 configs += [
62 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 64 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
63 "//build/config/compiler:no_size_t_to_int_warning", 65 "//build/config/compiler:no_size_t_to_int_warning",
64 "//gpu:gpu_implementation", 66 "//gpu:gpu_implementation",
65 ] 67 ]
66 68
67 deps = [ 69 deps = [
68 "//base", 70 "//base",
69 "//gpu/command_buffer/service:service_sources",
70 "//third_party/re2", 71 "//third_party/re2",
71 "//ui/gl", 72 "//ui/gl",
72 ] 73 ]
73 74
74 # Prefer mesa GL headers to system headers, which cause problems on Win. 75 # Prefer mesa GL headers to system headers, which cause problems on Win.
75 include_dirs = [ "//third_party/mesa/src/include" ] 76 include_dirs = [ "//third_party/mesa/src/include" ]
76 77
77 if (is_win) { 78 if (is_win) {
78 deps += [ "//third_party/libxml" ] 79 deps += [ "//third_party/libxml" ]
79 libs = [ 80 libs = [
(...skipping 23 matching lines...) Expand all
103 "//third_party/libXNVCtrl", 104 "//third_party/libXNVCtrl",
104 "//ui/gfx/x", 105 "//ui/gfx/x",
105 ] 106 ]
106 } else { 107 } else {
107 sources -= [ "gpu_info_collector_x11.cc" ] 108 sources -= [ "gpu_info_collector_x11.cc" ]
108 } 109 }
109 if (!use_ozone) { 110 if (!use_ozone) {
110 sources -= [ "gpu_info_collector_ozone.cc" ] 111 sources -= [ "gpu_info_collector_ozone.cc" ]
111 } 112 }
112 } 113 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc ('k') | gpu/config/gpu_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698