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 2310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2321 }], | 2321 }], |
| 2322 ['toolkit_views==1', { | 2322 ['toolkit_views==1', { |
| 2323 'sources': [ '<@(chrome_browser_tests_views_sources)' ], | 2323 'sources': [ '<@(chrome_browser_tests_views_sources)' ], |
| 2324 'dependencies': [ | 2324 'dependencies': [ |
| 2325 '../ui/views/views.gyp:views', | 2325 '../ui/views/views.gyp:views', |
| 2326 ], | 2326 ], |
| 2327 }], | 2327 }], |
| 2328 ['toolkit_views==1 and OS!="mac"', { | 2328 ['toolkit_views==1 and OS!="mac"', { |
| 2329 'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ], | 2329 'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ], |
| 2330 }], | 2330 }], |
| 2331 ['toolkit_views==1 and OS=="mac" and mac_views_browser==1', { | |
|
tapted
2015/03/04 02:27:33
nit: just check mac_views_browser?
jackhou1
2015/03/04 03:34:55
Removed.
| |
| 2332 'sources': [ | |
| 2333 'browser/ui/views/apps/chrome_native_app_window_views_mac_browsertes t.mm', | |
|
tapted
2015/03/04 02:27:33
Hm. I think this needs a new variable, otherwise e
jackhou1
2015/03/04 03:34:55
Done.
| |
| 2334 ], | |
| 2335 }], | |
| 2331 ['OS!="android" and OS!="ios"', { | 2336 ['OS!="android" and OS!="ios"', { |
| 2332 'sources': [ | 2337 'sources': [ |
| 2333 'browser/copresence/chrome_whispernet_client_browsertest.cc', | 2338 'browser/copresence/chrome_whispernet_client_browsertest.cc', |
| 2334 ], | 2339 ], |
| 2335 'dependencies': [ | 2340 'dependencies': [ |
| 2336 '../components/components.gyp:copresence', | 2341 '../components/components.gyp:copresence', |
| 2337 # build time dependency. | 2342 # build time dependency. |
| 2338 '../v8/src/d8.gyp:d8#host', | 2343 '../v8/src/d8.gyp:d8#host', |
| 2339 ], | 2344 ], |
| 2340 }], | 2345 }], |
| (...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3169 ['enable_webrtc==1', { | 3174 ['enable_webrtc==1', { |
| 3170 'dependencies': [ | 3175 'dependencies': [ |
| 3171 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3176 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3172 ] | 3177 ] |
| 3173 }], | 3178 }], |
| 3174 ], | 3179 ], |
| 3175 }] | 3180 }] |
| 3176 }], | 3181 }], |
| 3177 ], # 'conditions' | 3182 ], # 'conditions' |
| 3178 } | 3183 } |
| OLD | NEW |