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

Side by Side Diff: gpu/gpu_config.gypi

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../third_party/re2/re2.gyp:re2', 7 '../third_party/re2/re2.gyp:re2',
8 '../base/base.gyp:base', 8 '../base/base.gyp:base',
9 '../ui/gl/gl.gyp:gl', 9 '../ui/gl/gl.gyp:gl',
10 ], 10 ],
(...skipping 13 matching lines...) Expand all
24 'config/gpu_driver_bug_list.h', 24 'config/gpu_driver_bug_list.h',
25 'config/gpu_driver_bug_workaround_type.h', 25 'config/gpu_driver_bug_workaround_type.h',
26 'config/gpu_dx_diagnostics_win.cc', 26 'config/gpu_dx_diagnostics_win.cc',
27 'config/gpu_feature_type.h', 27 'config/gpu_feature_type.h',
28 'config/gpu_info.cc', 28 'config/gpu_info.cc',
29 'config/gpu_info.h', 29 'config/gpu_info.h',
30 'config/gpu_info_collector_android.cc', 30 'config/gpu_info_collector_android.cc',
31 'config/gpu_info_collector_linux.cc', 31 'config/gpu_info_collector_linux.cc',
32 'config/gpu_info_collector_linux.h', 32 'config/gpu_info_collector_linux.h',
33 'config/gpu_info_collector_mac.mm', 33 'config/gpu_info_collector_mac.mm',
34 'config/gpu_info_collector_ozone.cc',
34 'config/gpu_info_collector_win.cc', 35 'config/gpu_info_collector_win.cc',
35 'config/gpu_info_collector_x11.cc', 36 'config/gpu_info_collector_x11.cc',
36 'config/gpu_info_collector.cc', 37 'config/gpu_info_collector.cc',
37 'config/gpu_info_collector.h', 38 'config/gpu_info_collector.h',
38 'config/gpu_performance_stats.h', 39 'config/gpu_performance_stats.h',
39 'config/gpu_test_config.cc', 40 'config/gpu_test_config.cc',
40 'config/gpu_test_config.h', 41 'config/gpu_test_config.h',
41 'config/gpu_test_expectations_parser.cc', 42 'config/gpu_test_expectations_parser.cc',
42 'config/gpu_test_expectations_parser.h', 43 'config/gpu_test_expectations_parser.h',
43 'config/gpu_util.cc', 44 'config/gpu_util.cc',
(...skipping 13 matching lines...) Expand all
57 }, 58 },
58 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 59 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
59 'msvs_disabled_warnings': [ 4267, ], 60 'msvs_disabled_warnings': [ 4267, ],
60 }], 61 }],
61 ['OS=="win" and branding=="Chrome" and buildtype=="Official"', { 62 ['OS=="win" and branding=="Chrome" and buildtype=="Official"', {
62 'sources': [ 63 'sources': [
63 '../third_party/amd/AmdCfxPxExt.h', 64 '../third_party/amd/AmdCfxPxExt.h',
64 '../third_party/amd/amd_videocard_info_win.cc', 65 '../third_party/amd/amd_videocard_info_win.cc',
65 ], 66 ],
66 }], 67 }],
67 ['OS=="linux" and use_libpci==1 and use_x11==1', { 68 ['OS=="linux" and use_libpci==1 and (use_x11==1 or use_ozone==1)', {
68 'dependencies': [ 69 'dependencies': [
69 '../build/linux/system.gyp:libpci', 70 '../build/linux/system.gyp:libpci',
70 ], 71 ],
71 }], 72 }],
72 ['OS=="linux" and use_x11==1', { 73 ['OS=="linux" and use_x11==1', {
73 'dependencies': [ 74 'dependencies': [
74 '../build/linux/system.gyp:x11', 75 '../build/linux/system.gyp:x11',
75 '../build/linux/system.gyp:xext', 76 '../build/linux/system.gyp:xext',
76 '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', 77 '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
78 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
77 ], 79 ],
78 }], 80 }],
79 ], 81 ],
80 } 82 }
OLDNEW
« no previous file with comments | « gpu/gpu.gyp ('k') | gpu/gpu_unittests.isolate » ('j') | shell/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698