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

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

Issue 21952005: Reland: Remove webkit_chromium_resources.pak entries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
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 11 matching lines...) Expand all
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)/content/content_resources.rc', 29 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
30 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 30 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
31 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', 31 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
32 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
33 ], 32 ],
34 'conditions': [ 33 'conditions': [
35 ['win_use_allocator_shim==1', { 34 ['win_use_allocator_shim==1', {
36 'dependencies': [ 35 'dependencies': [
37 '../base/allocator/allocator.gyp:allocator', 36 '../base/allocator/allocator.gyp:allocator',
38 ], 37 ],
39 }], 38 }],
40 ], 39 ],
41 'configurations': { 40 'configurations': {
42 'Debug': { 41 'Debug': {
(...skipping 19 matching lines...) Expand all
62 '<(src_dir)/build/linux/system.gyp:ssl', 61 '<(src_dir)/build/linux/system.gyp:ssl',
63 ], 62 ],
64 }], 63 }],
65 ['toolkit_views==1', { 64 ['toolkit_views==1', {
66 'dependencies': [ 65 'dependencies': [
67 '<(src_dir)/ui/views/views.gyp:views', 66 '<(src_dir)/ui/views/views.gyp:views',
68 ], 67 ],
69 }], 68 }],
70 ], 69 ],
71 } 70 }
OLDNEW
« chrome/chrome_tests_unit.gypi ('K') | « content/DEPS ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698