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

Side by Side Diff: ui/gfx/gfx_tests.gyp

Issue 469003009: ui: Move win gfx tests into gfx_unittests target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix IconUtilTest Created 6 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
« no previous file with comments | « ui/base/test/run_all_unittests.cc ('k') | ui/gfx/icon_util_unittest.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 ['OS=="android" or OS=="ios"', { 139 ['OS=="android" or OS=="ios"', {
140 'sources!': [ 140 'sources!': [
141 'render_text_unittest.cc', 141 'render_text_unittest.cc',
142 ], 142 ],
143 }], 143 }],
144 ['use_aura==1', { 144 ['use_aura==1', {
145 'sources!': [ 145 'sources!': [
146 'screen_unittest.cc', 146 'screen_unittest.cc',
147 ], 147 ],
148 }], 148 }],
149 ['OS == "win"', {
150 'sources': [
151 'color_profile_win_unittest.cc',
152 'font_fallback_win_unittest.cc',
153 'icon_util_unittest.cc',
154 'icon_util_unittests.rc',
155 'platform_font_win_unittest.cc',
156 ],
157 'msvs_settings': {
158 'VCLinkerTool': {
159 'DelayLoadDLLs': [
160 'd2d1.dll',
161 'd3d10_1.dll',
162 ],
163 'AdditionalDependencies': [
164 'd2d1.lib',
165 'd3d10_1.lib',
166 ],
167 },
168 },
169 'link_settings': {
170 'libraries': [
171 '-limm32.lib',
172 '-loleacc.lib',
173 ],
174 },
175 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
176 'msvs_disabled_warnings': [ 4267, ],
177 }],
149 ], 178 ],
150 } 179 }
151 ], 180 ],
152 'conditions': [ 181 'conditions': [
153 ['OS == "android"', { 182 ['OS == "android"', {
154 'targets': [ 183 'targets': [
155 { 184 {
156 'target_name': 'gfx_unittests_apk', 185 'target_name': 'gfx_unittests_apk',
157 'type': 'none', 186 'type': 'none',
158 'dependencies': [ 187 'dependencies': [
159 '../android/ui_android.gyp:ui_java', 188 '../android/ui_android.gyp:ui_java',
160 'gfx_unittests', 189 'gfx_unittests',
161 ], 190 ],
162 'variables': { 191 'variables': {
163 'test_suite_name': 'gfx_unittests', 192 'test_suite_name': 'gfx_unittests',
164 }, 193 },
165 'includes': [ '../../build/apk_test.gypi' ], 194 'includes': [ '../../build/apk_test.gypi' ],
166 }, 195 },
167 ], 196 ],
168 }], 197 }],
169 ], 198 ],
170 } 199 }
OLDNEW
« no previous file with comments | « ui/base/test/run_all_unittests.cc ('k') | ui/gfx/icon_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698