| OLD | NEW |
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 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 'targets': [ | 5 'targets': [ |
| 6 { | 6 { |
| 7 # This target contains mocks and test utilities that don't belong in | 7 # This target contains mocks and test utilities that don't belong in |
| 8 # production libraries but are used by more than one test executable. | 8 # production libraries but are used by more than one test executable. |
| 9 'target_name': 'test_support_common', | 9 'target_name': 'test_support_common', |
| 10 'type': 'static_library', | 10 'type': 'static_library', |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 'sources': [ | 388 'sources': [ |
| 389 'common/media_galleries/picasa_test_util.cc', | 389 'common/media_galleries/picasa_test_util.cc', |
| 390 'common/media_galleries/picasa_test_util.cc', | 390 'common/media_galleries/picasa_test_util.cc', |
| 391 'common/media_galleries/pmp_test_util.cc', | 391 'common/media_galleries/pmp_test_util.cc', |
| 392 'common/media_galleries/pmp_test_util.h', | 392 'common/media_galleries/pmp_test_util.h', |
| 393 ], | 393 ], |
| 394 }], | 394 }], |
| 395 ['OS=="mac"', { | 395 ['OS=="mac"', { |
| 396 'dependencies': [ | 396 'dependencies': [ |
| 397 '../breakpad/breakpad.gyp:breakpad', | 397 '../breakpad/breakpad.gyp:breakpad', |
| 398 '../components/components.gyp:breakpad_component', | 398 '../components/components.gyp:crash_component', |
| 399 ], | 399 ], |
| 400 'sources': [ | 400 'sources': [ |
| 401 'app/chrome_breakpad_client.cc', | 401 'app/chrome_breakpad_client.cc', |
| 402 'app/chrome_breakpad_client_mac.mm', | 402 'app/chrome_breakpad_client_mac.mm', |
| 403 'app/chrome_main_mac.mm', | 403 'app/chrome_main_mac.mm', |
| 404 ], | 404 ], |
| 405 }], | 405 }], |
| 406 ['enable_mdns==1', { | 406 ['enable_mdns==1', { |
| 407 'sources': [ | 407 'sources': [ |
| 408 'browser/local_discovery/test_service_discovery_client.cc', | 408 'browser/local_discovery/test_service_discovery_client.cc', |
| (...skipping 2400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2809 ['OS=="mac"', { | 2809 ['OS=="mac"', { |
| 2810 # TODO(mark): We really want this for all non-static library targets, | 2810 # TODO(mark): We really want this for all non-static library targets, |
| 2811 # but when we tried to pull it up to the common.gypi level, it broke | 2811 # but when we tried to pull it up to the common.gypi level, it broke |
| 2812 # other things like the ui and startup tests. *shrug* | 2812 # other things like the ui and startup tests. *shrug* |
| 2813 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 2813 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 2814 }], | 2814 }], |
| 2815 ['OS=="win"', { | 2815 ['OS=="win"', { |
| 2816 'dependencies': [ | 2816 'dependencies': [ |
| 2817 # breakpad is currently only tested on Windows. | 2817 # breakpad is currently only tested on Windows. |
| 2818 '../breakpad/breakpad.gyp:*', | 2818 '../breakpad/breakpad.gyp:*', |
| 2819 '../components/components.gyp:breakpad_component', | 2819 '../components/components.gyp:crash_component', |
| 2820 ], | 2820 ], |
| 2821 'conditions': [ | 2821 'conditions': [ |
| 2822 ['win_use_allocator_shim==1', { | 2822 ['win_use_allocator_shim==1', { |
| 2823 'dependencies': [ | 2823 'dependencies': [ |
| 2824 '<(allocator_target)', | 2824 '<(allocator_target)', |
| 2825 ], | 2825 ], |
| 2826 }], | 2826 }], |
| 2827 ], | 2827 ], |
| 2828 'msvs_settings': { | 2828 'msvs_settings': { |
| 2829 'VCLinkerTool': { | 2829 'VCLinkerTool': { |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2885 'dependencies': [ | 2885 'dependencies': [ |
| 2886 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2886 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2887 ], | 2887 ], |
| 2888 }], | 2888 }], |
| 2889 ], | 2889 ], |
| 2890 }, | 2890 }, |
| 2891 ], | 2891 ], |
| 2892 }], | 2892 }], |
| 2893 ], # 'conditions' | 2893 ], # 'conditions' |
| 2894 } | 2894 } |
| OLD | NEW |