| 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 'variables': { | 6 'variables': { |
| 7 # A hook that can be overridden in other repositories to add additional | 7 # A hook that can be overridden in other repositories to add additional |
| 8 # compilation targets to 'All'. Only used on Android. | 8 # compilation targets to 'All'. Only used on Android. |
| 9 'android_app_targets%': [], | 9 'android_app_targets%': [], |
| 10 }, | 10 }, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 '../sdch/sdch.gyp:*', | 24 '../sdch/sdch.gyp:*', |
| 25 '../sql/sql.gyp:*', | 25 '../sql/sql.gyp:*', |
| 26 '../testing/gmock.gyp:*', | 26 '../testing/gmock.gyp:*', |
| 27 '../testing/gtest.gyp:*', | 27 '../testing/gtest.gyp:*', |
| 28 '../third_party/icu/icu.gyp:*', | 28 '../third_party/icu/icu.gyp:*', |
| 29 '../third_party/libxml/libxml.gyp:*', | 29 '../third_party/libxml/libxml.gyp:*', |
| 30 '../third_party/sqlite/sqlite.gyp:*', | 30 '../third_party/sqlite/sqlite.gyp:*', |
| 31 '../third_party/zlib/zlib.gyp:*', | 31 '../third_party/zlib/zlib.gyp:*', |
| 32 '../ui/accessibility/accessibility.gyp:*', | 32 '../ui/accessibility/accessibility.gyp:*', |
| 33 '../ui/base/ui_base.gyp:*', | 33 '../ui/base/ui_base.gyp:*', |
| 34 '../ui/display/display.gyp:display_unittests', |
| 34 '../ui/snapshot/snapshot.gyp:*', | 35 '../ui/snapshot/snapshot.gyp:*', |
| 35 '../url/url.gyp:*', | 36 '../url/url.gyp:*', |
| 36 ], | 37 ], |
| 37 'conditions': [ | 38 'conditions': [ |
| 38 ['OS=="ios"', { | 39 ['OS=="ios"', { |
| 39 'dependencies': [ | 40 'dependencies': [ |
| 40 '../ios/ios.gyp:*', | 41 '../ios/ios.gyp:*', |
| 41 '../ui/gfx/gfx_tests.gyp:gfx_unittests', | 42 '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| 42 '../ui/ui_unittests.gyp:ui_unittests', | 43 '../ui/ui_unittests.gyp:ui_unittests', |
| 43 ], | 44 ], |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 # TODO: Consider merging that with this target. | 251 # TODO: Consider merging that with this target. |
| 251 'target_name': 'chromium_builder_tests', | 252 'target_name': 'chromium_builder_tests', |
| 252 'type': 'none', | 253 'type': 'none', |
| 253 'dependencies': [ | 254 'dependencies': [ |
| 254 '../base/base.gyp:base_unittests', | 255 '../base/base.gyp:base_unittests', |
| 255 '../components/components_tests.gyp:components_unittests', | 256 '../components/components_tests.gyp:components_unittests', |
| 256 '../crypto/crypto.gyp:crypto_unittests', | 257 '../crypto/crypto.gyp:crypto_unittests', |
| 257 '../net/net.gyp:net_unittests', | 258 '../net/net.gyp:net_unittests', |
| 258 '../sql/sql.gyp:sql_unittests', | 259 '../sql/sql.gyp:sql_unittests', |
| 259 '../sync/sync.gyp:sync_unit_tests', | 260 '../sync/sync.gyp:sync_unit_tests', |
| 261 '../ui/display/display.gyp:display_unittests', |
| 260 '../ui/gfx/gfx_tests.gyp:gfx_unittests', | 262 '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| 261 '../ui/ui_unittests.gyp:ui_unittests', | 263 '../ui/ui_unittests.gyp:ui_unittests', |
| 262 '../url/url.gyp:url_unittests', | 264 '../url/url.gyp:url_unittests', |
| 263 ], | 265 ], |
| 264 'conditions': [ | 266 'conditions': [ |
| 265 ['OS!="ios" and OS!="android"', { | 267 ['OS!="ios" and OS!="android"', { |
| 266 'dependencies': [ | 268 'dependencies': [ |
| 267 '../cc/cc_tests.gyp:cc_unittests', | 269 '../cc/cc_tests.gyp:cc_unittests', |
| 268 '../chrome/chrome.gyp:browser_tests', | 270 '../chrome/chrome.gyp:browser_tests', |
| 269 '../chrome/chrome.gyp:chromedriver_tests', | 271 '../chrome/chrome.gyp:chromedriver_tests', |
| (...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1128 '../components/components_tests.gyp:components_unittests', | 1130 '../components/components_tests.gyp:components_unittests', |
| 1129 '../content/content_shell_and_tests.gyp:content_browsertests', | 1131 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 1130 '../content/content_shell_and_tests.gyp:content_unittests', | 1132 '../content/content_shell_and_tests.gyp:content_unittests', |
| 1131 '../device/device_tests.gyp:device_unittests', | 1133 '../device/device_tests.gyp:device_unittests', |
| 1132 '../google_apis/gcm/gcm.gyp:gcm_unit_tests', | 1134 '../google_apis/gcm/gcm.gyp:gcm_unit_tests', |
| 1133 '../ppapi/ppapi_internal.gyp:ppapi_unittests', | 1135 '../ppapi/ppapi_internal.gyp:ppapi_unittests', |
| 1134 '../remoting/remoting.gyp:remoting_unittests', | 1136 '../remoting/remoting.gyp:remoting_unittests', |
| 1135 '../ui/app_list/app_list.gyp:*', | 1137 '../ui/app_list/app_list.gyp:*', |
| 1136 '../ui/aura/aura.gyp:*', | 1138 '../ui/aura/aura.gyp:*', |
| 1137 '../ui/compositor/compositor.gyp:*', | 1139 '../ui/compositor/compositor.gyp:*', |
| 1140 '../ui/display/display.gyp:display_unittests', |
| 1138 '../ui/events/events.gyp:*', | 1141 '../ui/events/events.gyp:*', |
| 1139 '../ui/gfx/gfx_tests.gyp:gfx_unittests', | 1142 '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| 1140 '../ui/keyboard/keyboard.gyp:*', | 1143 '../ui/keyboard/keyboard.gyp:*', |
| 1141 '../ui/message_center/message_center.gyp:*', | 1144 '../ui/message_center/message_center.gyp:*', |
| 1142 '../ui/snapshot/snapshot.gyp:snapshot_unittests', | 1145 '../ui/snapshot/snapshot.gyp:snapshot_unittests', |
| 1143 '../ui/ui_unittests.gyp:ui_unittests', | 1146 '../ui/ui_unittests.gyp:ui_unittests', |
| 1144 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1147 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1145 '../ui/views/views.gyp:views', | 1148 '../ui/views/views.gyp:views', |
| 1146 '../ui/views/views.gyp:views_unittests', | 1149 '../ui/views/views.gyp:views_unittests', |
| 1147 '../ui/wm/wm.gyp:*', | 1150 '../ui/wm/wm.gyp:*', |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1216 # http://crbug.com/157234 | 1219 # http://crbug.com/157234 |
| 1217 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1220 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1218 '../chrome/chrome.gyp:unit_tests_run', | 1221 '../chrome/chrome.gyp:unit_tests_run', |
| 1219 '../net/net.gyp:net_unittests_run', | 1222 '../net/net.gyp:net_unittests_run', |
| 1220 ], | 1223 ], |
| 1221 }, # target_name: chromium_swarm_tests | 1224 }, # target_name: chromium_swarm_tests |
| 1222 ], | 1225 ], |
| 1223 }], | 1226 }], |
| 1224 ], # conditions | 1227 ], # conditions |
| 1225 } | 1228 } |
| OLD | NEW |