Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'ui_test_support', | 8 'target_name': 'ui_test_support', |
| 9 'dependencies': [ | 9 'dependencies': [ |
| 10 '../base/base.gyp:base', | 10 '../base/base.gyp:base', |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 'test/test_suite.h', | 102 'test/test_suite.h', |
| 103 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', | 103 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', |
| 104 ], | 104 ], |
| 105 'include_dirs': [ | 105 'include_dirs': [ |
| 106 '../', | 106 '../', |
| 107 ], | 107 ], |
| 108 'conditions': [ | 108 'conditions': [ |
| 109 ['OS == "win"', { | 109 ['OS == "win"', { |
| 110 'sources': [ | 110 'sources': [ |
| 111 'base/dragdrop/os_exchange_data_win_unittest.cc', | 111 'base/dragdrop/os_exchange_data_win_unittest.cc', |
| 112 # TODO(brettw) re-enable this when the dependencies on WindowImpl ar e fixed! | 112 'base/win/hwnd_subclass_unittest.cc', |
|
msw
2012/04/30 17:40:01
What's this? Bad merge?
Alexei Svitkine (slow)
2012/04/30 17:49:14
No, I moved this up from below to alphabetize them
msw
2012/04/30 18:55:39
Got it, thanks!
| |
| 113 'gfx/icon_util_unittest.cc', | 113 'gfx/icon_util_unittest.cc', |
| 114 'gfx/native_theme_win_unittest.cc', | 114 'gfx/native_theme_win_unittest.cc', |
| 115 'base/win/hwnd_subclass_unittest.cc', | 115 'gfx/platform_font_win_unittest.cc', |
| 116 ], | 116 ], |
| 117 'include_dirs': [ | 117 'include_dirs': [ |
| 118 '../..', | 118 '../..', |
| 119 '../third_party/wtl/include', | 119 '../third_party/wtl/include', |
| 120 ], | 120 ], |
| 121 'msvs_settings': { | 121 'msvs_settings': { |
| 122 'VCLinkerTool': { | 122 'VCLinkerTool': { |
| 123 'DelayLoadDLLs': [ | 123 'DelayLoadDLLs': [ |
| 124 'd2d1.dll', | 124 'd2d1.dll', |
| 125 'd3d10_1.dll', | 125 'd3d10_1.dll', |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 200 }], | 200 }], |
| 201 ['use_aura==1 or toolkit_views==1', { | 201 ['use_aura==1 or toolkit_views==1', { |
| 202 'sources': [ | 202 'sources': [ |
| 203 'base/gestures/velocity_calculator_unittest.cc', | 203 'base/gestures/velocity_calculator_unittest.cc', |
| 204 ], | 204 ], |
| 205 }], | 205 }], |
| 206 ], | 206 ], |
| 207 }, | 207 }, |
| 208 ], | 208 ], |
| 209 } | 209 } |
| OLD | NEW |