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

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

Issue 1281483012: Remove net_resources.rc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « components/components_tests.gyp ('k') | content/content_tests.gypi » ('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 # 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 },
(...skipping 10 matching lines...) Expand all
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 'sources': [ 28 'sources': [
29 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.rc', 29 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.rc',
30 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 30 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
31 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
32 ], 31 ],
33 'conditions': [ 32 'conditions': [
34 ['win_use_allocator_shim==1', { 33 ['win_use_allocator_shim==1', {
35 'dependencies': [ 34 'dependencies': [
36 '../base/allocator/allocator.gyp:allocator', 35 '../base/allocator/allocator.gyp:allocator',
37 ], 36 ],
38 }], 37 }],
39 ], 38 ],
40 'configurations': { 39 'configurations': {
41 'Debug': { 40 'Debug': {
(...skipping 14 matching lines...) Expand all
56 '<(src_dir)/build/linux/system.gyp:ssl', 55 '<(src_dir)/build/linux/system.gyp:ssl',
57 ], 56 ],
58 }], 57 }],
59 ['toolkit_views==1', { 58 ['toolkit_views==1', {
60 'dependencies': [ 59 'dependencies': [
61 '<(src_dir)/ui/views/views.gyp:views', 60 '<(src_dir)/ui/views/views.gyp:views',
62 ], 61 ],
63 }], 62 }],
64 ], 63 ],
65 } 64 }
OLDNEW
« no previous file with comments | « components/components_tests.gyp ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698