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

Side by Side Diff: gpu/gpu_config.gypi

Issue 142223002: Support -Goutput_dir=blahblah in GN-GYP hybrid mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: prefer command line over env if both are specified Created 6 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 | Annotate | Revision Log
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | third_party/leveldatabase/leveldatabase.gyp » ('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 (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 '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
7 '../base/base.gyp:base', 8 '../base/base.gyp:base',
8 '../out/gn_gyp/third_party/re2/re2.gyp:re2',
9 '../ui/gl/gl.gyp:gl', 9 '../ui/gl/gl.gyp:gl',
10 ], 10 ],
11 'include_dirs': [ 11 'include_dirs': [
12 '..', 12 '..',
13 ], 13 ],
14 'sources': [ 14 'sources': [
15 'config/dx_diag_node.cc', 15 'config/dx_diag_node.cc',
16 'config/dx_diag_node.h', 16 'config/dx_diag_node.h',
17 'config/gpu_blacklist.cc', 17 'config/gpu_blacklist.cc',
18 'config/gpu_blacklist.h', 18 'config/gpu_blacklist.h',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 ], 64 ],
65 }], 65 }],
66 ['OS=="linux" and use_x11==1', { 66 ['OS=="linux" and use_x11==1', {
67 'dependencies': [ 67 'dependencies': [
68 '../build/linux/system.gyp:libpci', 68 '../build/linux/system.gyp:libpci',
69 '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', 69 '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
70 ], 70 ],
71 }], 71 }],
72 ], 72 ],
73 } 73 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | third_party/leveldatabase/leveldatabase.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698