| 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 ['use_aura==1', { | 409 ['use_aura==1', { |
| 410 'dependencies': [ | 410 'dependencies': [ |
| 411 '../win8/win8.gyp:test_registrar_constants', | 411 '../win8/win8.gyp:test_registrar_constants', |
| 412 '../win8/win8.gyp:test_support_win8', | 412 '../win8/win8.gyp:test_support_win8', |
| 413 ], | 413 ], |
| 414 }], | 414 }], |
| 415 ], | 415 ], |
| 416 }], | 416 }], |
| 417 ['OS=="win" or OS=="mac"', { | 417 ['OS=="win" or OS=="mac"', { |
| 418 'sources': [ | 418 'sources': [ |
| 419 'common/extensions/api/networking_private/networking_private_crypto_
unittest.cc', |
| 419 'common/media_galleries/picasa_test_util.cc', | 420 'common/media_galleries/picasa_test_util.cc', |
| 420 'common/media_galleries/picasa_test_util.cc', | 421 'common/media_galleries/picasa_test_util.cc', |
| 421 'common/media_galleries/pmp_test_util.cc', | 422 'common/media_galleries/pmp_test_util.cc', |
| 422 'common/media_galleries/pmp_test_util.h', | 423 'common/media_galleries/pmp_test_util.h', |
| 423 ], | 424 ], |
| 424 }], | 425 }], |
| 425 ['OS=="mac"', { | 426 ['OS=="mac"', { |
| 426 'dependencies': [ | 427 'dependencies': [ |
| 427 '../components/components.gyp:breakpad_stubs', | 428 '../components/components.gyp:breakpad_stubs', |
| 428 ], | 429 ], |
| (...skipping 2035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2464 ['win_use_allocator_shim==1', { | 2465 ['win_use_allocator_shim==1', { |
| 2465 'dependencies': [ | 2466 'dependencies': [ |
| 2466 '<(allocator_target)', | 2467 '<(allocator_target)', |
| 2467 ], | 2468 ], |
| 2468 }], | 2469 }], |
| 2469 ], | 2470 ], |
| 2470 'include_dirs': [ | 2471 'include_dirs': [ |
| 2471 '<(DEPTH)/third_party/wtl/include', | 2472 '<(DEPTH)/third_party/wtl/include', |
| 2472 ], | 2473 ], |
| 2473 'sources': [ | 2474 'sources': [ |
| 2474 'browser/extensions/api/networking_private/networking_private_crypto
_unittest.cc', | |
| 2475 # TODO: It would be nice to have these pulled in | 2475 # TODO: It would be nice to have these pulled in |
| 2476 # automatically from direct_dependent_settings in | 2476 # automatically from direct_dependent_settings in |
| 2477 # their various targets (net.gyp:net_resources, etc.), | 2477 # their various targets (net.gyp:net_resources, etc.), |
| 2478 # but that causes errors in other targets when | 2478 # but that causes errors in other targets when |
| 2479 # resulting .res files get referenced multiple times. | 2479 # resulting .res files get referenced multiple times. |
| 2480 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', | 2480 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
| 2481 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st
rings.rc', | 2481 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st
rings.rc', |
| 2482 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc
', | 2482 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc
', |
| 2483 ], | 2483 ], |
| 2484 'link_settings': { | 2484 'link_settings': { |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2676 ], | 2676 ], |
| 2677 }], | 2677 }], |
| 2678 ['use_nss==0 and use_openssl==0', { | 2678 ['use_nss==0 and use_openssl==0', { |
| 2679 'sources!': [ | 2679 'sources!': [ |
| 2680 'common/net/x509_certificate_model_unittest.cc', | 2680 'common/net/x509_certificate_model_unittest.cc', |
| 2681 ], | 2681 ], |
| 2682 }], | 2682 }], |
| 2683 ['use_openssl==1', { | 2683 ['use_openssl==1', { |
| 2684 'sources!': [ | 2684 'sources!': [ |
| 2685 # networking_private_crypto.cc uses NSS functions. | 2685 # networking_private_crypto.cc uses NSS functions. |
| 2686 'browser/extensions/api/networking_private/networking_private_crypto
_unittest.cc', | 2686 'common/extensions/api/networking_private/networking_private_crypto_
unittest.cc', |
| 2687 ], | 2687 ], |
| 2688 'sources/': [ | 2688 'sources/': [ |
| 2689 # OpenSSL build does not support firefox importer. See | 2689 # OpenSSL build does not support firefox importer. See |
| 2690 # http://crbug.com/64926 | 2690 # http://crbug.com/64926 |
| 2691 ['exclude', '^browser/importer/'], | 2691 ['exclude', '^browser/importer/'], |
| 2692 ], | 2692 ], |
| 2693 }], | 2693 }], |
| 2694 ['enable_managed_users!=1', { | 2694 ['enable_managed_users!=1', { |
| 2695 'sources/': [ | 2695 'sources/': [ |
| 2696 ['exclude', '^browser/managed_mode/'], | 2696 ['exclude', '^browser/managed_mode/'], |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2890 'browser/ui/app_list/test/fake_profile_store.h', | 2890 'browser/ui/app_list/test/fake_profile_store.h', |
| 2891 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', | 2891 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', |
| 2892 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc', | 2892 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc', |
| 2893 'browser/ui/views/app_list/win/app_list_win_unittest.cc', | 2893 'browser/ui/views/app_list/win/app_list_win_unittest.cc', |
| 2894 ], | 2894 ], |
| 2895 }, | 2895 }, |
| 2896 ], | 2896 ], |
| 2897 }], | 2897 }], |
| 2898 ], # 'conditions' | 2898 ], # 'conditions' |
| 2899 } | 2899 } |
| OLD | NEW |