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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gfx_tests.gyp
diff --git a/ui/gfx/gfx_tests.gyp b/ui/gfx/gfx_tests.gyp
index 0c71643aa7e33b46745b3ce531dfd2cbf2b2cec8..710a3d5104694bedf307bb6848bb012079c2b539 100644
--- a/ui/gfx/gfx_tests.gyp
+++ b/ui/gfx/gfx_tests.gyp
@@ -146,6 +146,35 @@
'screen_unittest.cc',
],
}],
+ ['OS == "win"', {
+ 'sources': [
+ 'color_profile_win_unittest.cc',
+ 'font_fallback_win_unittest.cc',
+ 'icon_util_unittest.cc',
+ 'icon_util_unittests.rc',
+ 'platform_font_win_unittest.cc',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'd2d1.dll',
+ 'd3d10_1.dll',
+ ],
+ 'AdditionalDependencies': [
+ 'd2d1.lib',
+ 'd3d10_1.lib',
+ ],
+ },
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-limm32.lib',
+ '-loleacc.lib',
+ ],
+ },
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4267, ],
+ }],
],
}
],
« 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