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 'type': 'static_library', | 9 'type': 'static_library', |
10 'dependencies': [ | 10 'dependencies': [ |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 'dependencies': [ | 44 'dependencies': [ |
45 '../base/base.gyp:base', | 45 '../base/base.gyp:base', |
46 '../base/base.gyp:test_support_base', | 46 '../base/base.gyp:test_support_base', |
47 '../build/temp_gyp/googleurl.gyp:googleurl', | 47 '../build/temp_gyp/googleurl.gyp:googleurl', |
48 '../skia/skia.gyp:skia', | 48 '../skia/skia.gyp:skia', |
49 '../testing/gmock.gyp:gmock', | 49 '../testing/gmock.gyp:gmock', |
50 '../testing/gtest.gyp:gtest', | 50 '../testing/gtest.gyp:gtest', |
51 '../third_party/icu/icu.gyp:icui18n', | 51 '../third_party/icu/icu.gyp:icui18n', |
52 '../third_party/icu/icu.gyp:icuuc', | 52 '../third_party/icu/icu.gyp:icuuc', |
53 '../third_party/libpng/libpng.gyp:libpng', | 53 '../third_party/libpng/libpng.gyp:libpng', |
54 '../ui/surface/surface.gyp:surface', | |
ncarter (slow)
2012/12/17 19:13:49
I'm seeing a circular dependency error on the Mac
apatrick_chromium
2012/12/17 21:30:44
Still or does this fix it? There's a gyp-explain t
ncarter (slow)
2012/12/17 23:48:46
I think it's a circular dependency in the .gyp fil
apatrick_chromium
2012/12/18 00:01:12
Any of those three are okay I think. Do whichever
| |
54 'ui', | 55 'ui', |
55 'ui_resources', | 56 'ui_resources', |
56 'ui_test_support', | 57 'ui_test_support', |
57 ], | 58 ], |
58 # iOS uses a small subset of ui. common_sources are the only files that | 59 # iOS uses a small subset of ui. common_sources are the only files that |
59 # are built on iOS. | 60 # are built on iOS. |
60 'common_sources' : [ | 61 'common_sources' : [ |
61 'base/animation/animation_container_unittest.cc', | 62 'base/animation/animation_container_unittest.cc', |
62 'base/animation/animation_unittest.cc', | 63 'base/animation/animation_unittest.cc', |
63 'base/animation/multi_animation_unittest.cc', | 64 'base/animation/multi_animation_unittest.cc', |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 'gfx/canvas_unittest.cc', | 126 'gfx/canvas_unittest.cc', |
126 'gfx/codec/jpeg_codec_unittest.cc', | 127 'gfx/codec/jpeg_codec_unittest.cc', |
127 'gfx/color_analysis_unittest.cc', | 128 'gfx/color_analysis_unittest.cc', |
128 'gfx/font_list_unittest.cc', | 129 'gfx/font_list_unittest.cc', |
129 'gfx/image/image_mac_unittest.mm', | 130 'gfx/image/image_mac_unittest.mm', |
130 'gfx/image/image_util_unittest.cc', | 131 'gfx/image/image_util_unittest.cc', |
131 'gfx/platform_font_mac_unittest.mm', | 132 'gfx/platform_font_mac_unittest.mm', |
132 'gfx/render_text_unittest.cc', | 133 'gfx/render_text_unittest.cc', |
133 'gfx/transform_util_unittest.cc', | 134 'gfx/transform_util_unittest.cc', |
134 'gfx/video_decode_acceleration_support_mac_unittest.mm', | 135 'gfx/video_decode_acceleration_support_mac_unittest.mm', |
136 'surface/accelerated_surface_transformer_win_unittest.cc' | |
135 ], | 137 ], |
136 'include_dirs': [ | 138 'include_dirs': [ |
137 '../', | 139 '../', |
138 ], | 140 ], |
139 'conditions': [ | 141 'conditions': [ |
140 ['OS!="ios"', { | 142 ['OS!="ios"', { |
141 'sources' : ['<@(_all_sources)'], | 143 'sources' : ['<@(_all_sources)'], |
142 'includes': [ | 144 'includes': [ |
143 'base/ime/ime_unittests.gypi', | 145 'base/ime/ime_unittests.gypi', |
144 ], | 146 ], |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
290 'variables': { | 292 'variables': { |
291 'test_suite_name': 'ui_unittests', | 293 'test_suite_name': 'ui_unittests', |
292 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unitte sts<(SHARED_LIB_SUFFIX)', | 294 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unitte sts<(SHARED_LIB_SUFFIX)', |
293 }, | 295 }, |
294 'includes': [ '../build/apk_test.gypi' ], | 296 'includes': [ '../build/apk_test.gypi' ], |
295 }, | 297 }, |
296 ], | 298 ], |
297 }], | 299 }], |
298 ], | 300 ], |
299 } | 301 } |
OLD | NEW |