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

Side by Side Diff: trunk/src/chrome/test/gpu/test_support_gpu.gypi

Issue 14882004: Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | « trunk/src/chrome/chrome_tests_unit.gypi ('k') | trunk/src/content/app/content_main_runner.cc » ('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)/chrome/test/gpu', 8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu',
9 'src_dir': '../../..', 9 'src_dir': '../../..',
10 }, 10 },
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ['toolkit_views==1', { 95 ['toolkit_views==1', {
96 'dependencies': [ 96 'dependencies': [
97 '<(src_dir)/ui/views/views.gyp:views', 97 '<(src_dir)/ui/views/views.gyp:views',
98 ], 98 ],
99 }], 99 }],
100 ['OS=="android"', { 100 ['OS=="android"', {
101 'dependencies!': [ 101 'dependencies!': [
102 'chrome', 102 'chrome',
103 ], 103 ],
104 'dependencies': [ 104 'dependencies': [
105 '<@(chromium_browser_dependencies)', 105 '<@(chromium_dependencies)',
106 '<@(chromium_child_dependencies)',
107 'chrome_resources.gyp:packed_resources', 106 'chrome_resources.gyp:packed_resources',
108 'chrome_resources.gyp:packed_extra_resources', 107 'chrome_resources.gyp:packed_extra_resources',
109 ], 108 ],
110 }], 109 }],
111 ], 110 ],
112 } 111 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_tests_unit.gypi ('k') | trunk/src/content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698