| 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 2560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2571 }], | 2571 }], |
| 2572 ['os_posix == 1 and OS != "mac" and OS != "android"', { | 2572 ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| 2573 'conditions': [ | 2573 'conditions': [ |
| 2574 ['use_allocator!="none"', { | 2574 ['use_allocator!="none"', { |
| 2575 'dependencies': [ | 2575 'dependencies': [ |
| 2576 '../base/allocator/allocator.gyp:allocator', | 2576 '../base/allocator/allocator.gyp:allocator', |
| 2577 ], | 2577 ], |
| 2578 }], | 2578 }], |
| 2579 ], | 2579 ], |
| 2580 }], | 2580 }], |
| 2581 ['OS=="win" and component!="shared_library" and win_use_allocator_shim==
1', { |
| 2582 'dependencies': [ |
| 2583 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| 2584 ], |
| 2585 }], |
| 2581 ], # conditions | 2586 ], # conditions |
| 2582 }, # target performance_browser_tests | 2587 }, # target performance_browser_tests |
| 2583 { | 2588 { |
| 2584 'target_name': 'test_support_sync_integration', | 2589 'target_name': 'test_support_sync_integration', |
| 2585 'type': 'static_library', | 2590 'type': 'static_library', |
| 2586 'dependencies': [ | 2591 'dependencies': [ |
| 2587 'browser', | 2592 'browser', |
| 2588 'chrome', | 2593 'chrome', |
| 2589 'test_support_common', | 2594 'test_support_common', |
| 2590 '../base/base.gyp:base', | 2595 '../base/base.gyp:base', |
| (...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3199 ['enable_webrtc==1', { | 3204 ['enable_webrtc==1', { |
| 3200 'dependencies': [ | 3205 'dependencies': [ |
| 3201 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3206 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3202 ] | 3207 ] |
| 3203 }], | 3208 }], |
| 3204 ], | 3209 ], |
| 3205 }] | 3210 }] |
| 3206 }], | 3211 }], |
| 3207 ], # 'conditions' | 3212 ], # 'conditions' |
| 3208 } | 3213 } |
| OLD | NEW |