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

Side by Side Diff: content/browser/gpu/test_support_gpu.gypi

Issue 1462853002: [clean-up] Remove allocator.gyp dependency from library targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add to chrome_child_dll Created 5 years, 1 month 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 | « components/web_cache.gypi ('k') | no next file » | 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 # This file is meant to be included into targets which run gpu tests. 5 # This file is meant to be included into targets which run gpu tests.
6 { 6 {
7 'variables': { 7 'variables': {
8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu', 8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu',
9 'src_dir': '../../..', 9 'src_dir': '../../..',
10 }, 10 },
11 'defines': [ 11 'defines': [
12 'HAS_OUT_OF_PROC_TEST_RUNNER', 12 'HAS_OUT_OF_PROC_TEST_RUNNER',
13 ], 13 ],
14 'include_dirs': [ 14 'include_dirs': [
15 '<(src_dir)', 15 '<(src_dir)',
16 '<(test_list_out_dir)', 16 '<(test_list_out_dir)',
17 ], 17 ],
18 # hard_dependency is necessary for this target because it has actions 18 # hard_dependency is necessary for this target because it has actions
19 # that generate a header file included by dependent targets. The header 19 # that generate a header file included by dependent targets. The header
20 # file must be generated before the dependents are compiled. The usual 20 # file must be generated before the dependents are compiled. The usual
21 # semantics are to allow the two targets to build concurrently. 21 # semantics are to allow the two targets to build concurrently.
22 'hard_dependency': 1, 22 'hard_dependency': 1,
23 'conditions': [ 23 'conditions': [
24 ['OS=="win"', { 24 ['OS=="win"', {
25 'include_dirs': [ 25 'include_dirs': [
26 '<(DEPTH)/third_party/wtl/include', 26 '<(DEPTH)/third_party/wtl/include',
27 ], 27 ],
28 'conditions': [
29 ['win_use_allocator_shim==1', {
30 'dependencies': [
31 '../base/allocator/allocator.gyp:allocator',
32 ],
33 }],
34 ],
35 'configurations': { 28 'configurations': {
36 'Debug': { 29 'Debug': {
37 'msvs_settings': { 30 'msvs_settings': {
38 'VCLinkerTool': { 31 'VCLinkerTool': {
39 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 32 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
40 }, 33 },
41 }, 34 },
42 }, 35 },
43 }, 36 },
44 }], 37 }],
45 ['OS=="mac"', { 38 ['OS=="mac"', {
46 # See comments about "xcode_settings" elsewhere in this file. 39 # See comments about "xcode_settings" elsewhere in this file.
47 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 40 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
48 }], 41 }],
49 ['chromeos==1 or (OS=="linux" and use_aura==1)', { 42 ['chromeos==1 or (OS=="linux" and use_aura==1)', {
50 'dependencies': [ 43 'dependencies': [
51 '<(src_dir)/build/linux/system.gyp:ssl', 44 '<(src_dir)/build/linux/system.gyp:ssl',
52 ], 45 ],
53 }], 46 }],
54 ['toolkit_views==1', { 47 ['toolkit_views==1', {
55 'dependencies': [ 48 'dependencies': [
56 '<(src_dir)/ui/views/views.gyp:views', 49 '<(src_dir)/ui/views/views.gyp:views',
57 ], 50 ],
58 }], 51 }],
59 ], 52 ],
60 } 53 }
OLDNEW
« no previous file with comments | « components/web_cache.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698