| 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 | 7 |
| 8 # Define the common dependencies that contain all the actual | 8 # Define the common dependencies that contain all the actual |
| 9 # Chromium functionality. This list gets pulled in below by | 9 # Chromium functionality. This list gets pulled in below by |
| 10 # the link of the actual chrome (or chromium) executable on | 10 # the link of the actual chrome (or chromium) executable on |
| (...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 897 # For historical reasons, chrome/chrome.sln has been the entry point | 897 # For historical reasons, chrome/chrome.sln has been the entry point |
| 898 # for new Chrome developers. To assist development, include several | 898 # for new Chrome developers. To assist development, include several |
| 899 # core unittests that are otherwise only accessible side-by-side with | 899 # core unittests that are otherwise only accessible side-by-side with |
| 900 # chrome via all/all.sln. | 900 # chrome via all/all.sln. |
| 901 'target_name': 'test_targets', | 901 'target_name': 'test_targets', |
| 902 'type': 'none', | 902 'type': 'none', |
| 903 'dependencies': [ | 903 'dependencies': [ |
| 904 '../base/base.gyp:base_unittests', | 904 '../base/base.gyp:base_unittests', |
| 905 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | 905 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', |
| 906 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | 906 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', |
| 907 '../content/content.gyp:content_browsertests', | 907 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 908 '../content/content.gyp:content_shell', | 908 '../content/content_shell_and_tests.gyp:content_unittests', |
| 909 '../content/content.gyp:content_unittests', | 909 '../content/content_shell_and_tests.gyp:content_shell', |
| 910 '../net/net.gyp:net_unittests', | 910 '../net/net.gyp:net_unittests', |
| 911 '../ui/ui.gyp:ui_unittests', | 911 '../ui/ui.gyp:ui_unittests', |
| 912 ], | 912 ], |
| 913 'conditions': [ | 913 'conditions': [ |
| 914 ['use_aura==1 or target_arch=="x64"', { | 914 ['use_aura==1 or target_arch=="x64"', { |
| 915 'dependencies!': [ | 915 'dependencies!': [ |
| 916 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | 916 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', |
| 917 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | 917 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', |
| 918 ], | 918 ], |
| 919 }], | 919 }], |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 ], # 'targets' | 1168 ], # 'targets' |
| 1169 'includes': [ | 1169 'includes': [ |
| 1170 'chrome_android.gypi', | 1170 'chrome_android.gypi', |
| 1171 ]}, # 'includes' | 1171 ]}, # 'includes' |
| 1172 ], # OS=="android" | 1172 ], # OS=="android" |
| 1173 ['configuration_policy==1 and OS!="android"', { | 1173 ['configuration_policy==1 and OS!="android"', { |
| 1174 'includes': [ 'policy.gypi', ], | 1174 'includes': [ 'policy.gypi', ], |
| 1175 }], | 1175 }], |
| 1176 ], # 'conditions' | 1176 ], # 'conditions' |
| 1177 } | 1177 } |
| OLD | NEW |