Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'chrome_browser_extensions_test_support_sources': [ | 6 'chrome_browser_extensions_test_support_sources': [ |
| 7 # A list of sources which is shared between different browser tests. | 7 # A list of sources which is shared between different browser tests. |
| 8 'browser/apps/app_browsertest_util.cc', | 8 'browser/apps/app_browsertest_util.cc', |
| 9 'browser/apps/app_browsertest_util.h', | 9 'browser/apps/app_browsertest_util.h', |
| 10 'browser/extensions/browsertest_util.cc', | 10 'browser/extensions/browsertest_util.cc', |
| (...skipping 3047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3058 ], | 3058 ], |
| 3059 'sources': [ | 3059 'sources': [ |
| 3060 'browser_tests.isolate', | 3060 'browser_tests.isolate', |
| 3061 ], | 3061 ], |
| 3062 'conditions': [ | 3062 'conditions': [ |
| 3063 ['use_x11==1', { | 3063 ['use_x11==1', { |
| 3064 'dependencies': [ | 3064 'dependencies': [ |
| 3065 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 3065 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 3066 ], | 3066 ], |
| 3067 }], | 3067 }], |
| 3068 ['OS=="mac"', { | |
| 3069 'dependencies': [ | |
| 3070 'chrome_main_dll', | |
|
Nico
2015/05/04 16:08:11
This should be unnecessary because chrome should d
| |
| 3071 ], | |
| 3072 }], | |
| 3068 ], | 3073 ], |
| 3069 }, | 3074 }, |
| 3070 { | 3075 { |
| 3071 'target_name': 'interactive_ui_tests_run', | 3076 'target_name': 'interactive_ui_tests_run', |
| 3072 'type': 'none', | 3077 'type': 'none', |
| 3073 'dependencies': [ | 3078 'dependencies': [ |
| 3074 'interactive_ui_tests', | 3079 'interactive_ui_tests', |
| 3075 ], | 3080 ], |
| 3076 'conditions': [ | 3081 'conditions': [ |
| 3077 ['use_x11 == 1', { | 3082 ['use_x11 == 1', { |
| 3078 'dependencies': [ | 3083 'dependencies': [ |
| 3079 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 3084 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 3080 ], | 3085 ], |
| 3081 }], | 3086 }], |
| 3087 ['OS=="mac"', { | |
| 3088 'dependencies': [ | |
| 3089 'chrome_main_dll', | |
|
Nico
2015/05/04 16:08:11
likewise
| |
| 3090 ], | |
| 3091 }], | |
| 3082 ], | 3092 ], |
| 3083 'includes': [ | 3093 'includes': [ |
| 3084 '../build/isolate.gypi', | 3094 '../build/isolate.gypi', |
| 3085 ], | 3095 ], |
| 3086 'sources': [ | 3096 'sources': [ |
| 3087 'interactive_ui_tests.isolate', | 3097 'interactive_ui_tests.isolate', |
| 3088 ], | 3098 ], |
| 3089 }, | 3099 }, |
| 3090 { | 3100 { |
| 3091 'target_name': 'sync_integration_tests_run', | 3101 'target_name': 'sync_integration_tests_run', |
| 3092 'type': 'none', | 3102 'type': 'none', |
| 3093 'dependencies': [ | 3103 'dependencies': [ |
| 3094 'sync_integration_tests', | 3104 'sync_integration_tests', |
| 3095 ], | 3105 ], |
| 3096 'conditions': [ | 3106 'conditions': [ |
| 3097 ['use_x11 == 1', { | 3107 ['use_x11 == 1', { |
| 3098 'dependencies': [ | 3108 'dependencies': [ |
| 3099 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 3109 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 3100 ], | 3110 ], |
| 3101 }], | 3111 }], |
| 3112 ['OS=="mac"', { | |
| 3113 'dependencies': [ | |
| 3114 'chrome_main_dll', | |
| 3115 ], | |
| 3116 }], | |
| 3102 ], | 3117 ], |
| 3103 'includes': [ | 3118 'includes': [ |
| 3104 '../build/isolate.gypi', | 3119 '../build/isolate.gypi', |
| 3105 ], | 3120 ], |
| 3106 'sources': [ | 3121 'sources': [ |
| 3107 'sync_integration_tests.isolate', | 3122 'sync_integration_tests.isolate', |
| 3108 ], | 3123 ], |
| 3109 }, | 3124 }, |
| 3110 ], | 3125 ], |
| 3111 'conditions': [ | 3126 'conditions': [ |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3243 ['enable_webrtc==1', { | 3258 ['enable_webrtc==1', { |
| 3244 'dependencies': [ | 3259 'dependencies': [ |
| 3245 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3260 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3246 ] | 3261 ] |
| 3247 }], | 3262 }], |
| 3248 ], | 3263 ], |
| 3249 }] | 3264 }] |
| 3250 }], | 3265 }], |
| 3251 ], # 'conditions' | 3266 ], # 'conditions' |
| 3252 } | 3267 } |
| OLD | NEW |