| 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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 'chrome_resources.gyp:chrome_strings', | 480 'chrome_resources.gyp:chrome_strings', |
| 481 ], | 481 ], |
| 482 # TODO(joi): Remove this section once the google_apis tests are | 482 # TODO(joi): Remove this section once the google_apis tests are |
| 483 # a separate unit test binary. | 483 # a separate unit test binary. |
| 484 'includes': [ | 484 'includes': [ |
| 485 '../google_apis/determine_use_official_keys.gypi', | 485 '../google_apis/determine_use_official_keys.gypi', |
| 486 ], | 486 ], |
| 487 'include_dirs': [ | 487 'include_dirs': [ |
| 488 '..', | 488 '..', |
| 489 ], | 489 ], |
| 490 'defines': [ | |
| 491 'CLD_WINDOWS', | |
| 492 ], | |
| 493 'direct_dependent_settings': { | |
| 494 'defines': [ | |
| 495 'CLD_WINDOWS', | |
| 496 ], | |
| 497 }, | |
| 498 'msvs_settings': { | 490 'msvs_settings': { |
| 499 'VCLinkerTool': { | 491 'VCLinkerTool': { |
| 500 'conditions': [ | 492 'conditions': [ |
| 501 ['incremental_chrome_dll==1', { | 493 ['incremental_chrome_dll==1', { |
| 502 'UseLibraryDependencyInputs': "true", | 494 'UseLibraryDependencyInputs': "true", |
| 503 }], | 495 }], |
| 504 ], | 496 ], |
| 505 }, | 497 }, |
| 506 }, | 498 }, |
| 507 'sources': [ | 499 'sources': [ |
| (...skipping 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1930 '../skia/ext/convolver_unittest.cc', | 1922 '../skia/ext/convolver_unittest.cc', |
| 1931 '../skia/ext/image_operations_unittest.cc', | 1923 '../skia/ext/image_operations_unittest.cc', |
| 1932 '../skia/ext/lazy_pixel_ref_utils_unittest.cc', | 1924 '../skia/ext/lazy_pixel_ref_utils_unittest.cc', |
| 1933 '../skia/ext/platform_canvas_unittest.cc', | 1925 '../skia/ext/platform_canvas_unittest.cc', |
| 1934 '../skia/ext/recursive_gaussian_convolution_unittest.cc', | 1926 '../skia/ext/recursive_gaussian_convolution_unittest.cc', |
| 1935 '../skia/ext/refptr_unittest.cc', | 1927 '../skia/ext/refptr_unittest.cc', |
| 1936 '../skia/ext/skia_utils_ios_unittest.mm', | 1928 '../skia/ext/skia_utils_ios_unittest.mm', |
| 1937 '../skia/ext/skia_utils_mac_unittest.mm', | 1929 '../skia/ext/skia_utils_mac_unittest.mm', |
| 1938 '../skia/ext/vector_canvas_unittest.cc', | 1930 '../skia/ext/vector_canvas_unittest.cc', |
| 1939 '../testing/gtest_mac_unittest.mm', | 1931 '../testing/gtest_mac_unittest.mm', |
| 1940 '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest
_small.cc', | |
| 1941 '../third_party/zlib/google/zip_reader_unittest.cc', | 1932 '../third_party/zlib/google/zip_reader_unittest.cc', |
| 1942 '../third_party/zlib/google/zip_unittest.cc', | 1933 '../third_party/zlib/google/zip_unittest.cc', |
| 1943 '../tools/json_schema_compiler/test/additional_properties_unittest.cc', | 1934 '../tools/json_schema_compiler/test/additional_properties_unittest.cc', |
| 1944 '../tools/json_schema_compiler/test/any_unittest.cc', | 1935 '../tools/json_schema_compiler/test/any_unittest.cc', |
| 1945 '../tools/json_schema_compiler/test/arrays_unittest.cc', | 1936 '../tools/json_schema_compiler/test/arrays_unittest.cc', |
| 1946 '../tools/json_schema_compiler/test/callbacks_unittest.cc', | 1937 '../tools/json_schema_compiler/test/callbacks_unittest.cc', |
| 1947 '../tools/json_schema_compiler/test/choices_unittest.cc', | 1938 '../tools/json_schema_compiler/test/choices_unittest.cc', |
| 1948 '../tools/json_schema_compiler/test/crossref_unittest.cc', | 1939 '../tools/json_schema_compiler/test/crossref_unittest.cc', |
| 1949 '../tools/json_schema_compiler/test/enums_unittest.cc', | 1940 '../tools/json_schema_compiler/test/enums_unittest.cc', |
| 1950 '../tools/json_schema_compiler/test/functions_as_parameters_unittest.cc'
, | 1941 '../tools/json_schema_compiler/test/functions_as_parameters_unittest.cc'
, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 1968 'conditions': [ | 1959 'conditions': [ |
| 1969 ['OS!="ios"', { | 1960 ['OS!="ios"', { |
| 1970 'dependencies': [ | 1961 'dependencies': [ |
| 1971 'common/extensions/api/api.gyp:api', | 1962 'common/extensions/api/api.gyp:api', |
| 1972 '../components/components.gyp:autofill_content_test_support', | 1963 '../components/components.gyp:autofill_content_test_support', |
| 1973 '../components/component_strings.gyp:component_strings', | 1964 '../components/component_strings.gyp:component_strings', |
| 1974 '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', | 1965 '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', |
| 1975 '../gpu/gpu.gyp:gpu_unittest_utils', | 1966 '../gpu/gpu.gyp:gpu_unittest_utils', |
| 1976 '../media/media.gyp:media_test_support', | 1967 '../media/media.gyp:media_test_support', |
| 1977 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', | 1968 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', |
| 1978 '../third_party/cld/cld.gyp:cld', | |
| 1979 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 1969 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
| 1980 '../third_party/libjingle/libjingle.gyp:libjingle', | 1970 '../third_party/libjingle/libjingle.gyp:libjingle', |
| 1981 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', | 1971 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', |
| 1982 '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:j
son_schema_compiler_tests', | 1972 '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:j
son_schema_compiler_tests', |
| 1983 '../ui/gl/gl.gyp:gl', | 1973 '../ui/gl/gl.gyp:gl', |
| 1984 '../v8/tools/gyp/v8.gyp:v8', | 1974 '../v8/tools/gyp/v8.gyp:v8', |
| 1985 '../webkit/webkit_resources.gyp:webkit_resources', | 1975 '../webkit/webkit_resources.gyp:webkit_resources', |
| 1986 ], | 1976 ], |
| 1987 # TODO(scr): Use this in browser_tests too. | 1977 # TODO(scr): Use this in browser_tests too. |
| 1988 'includes': [ | 1978 'includes': [ |
| (...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2626 ['enable_managed_users!=1', { | 2616 ['enable_managed_users!=1', { |
| 2627 'sources/': [ | 2617 'sources/': [ |
| 2628 ['exclude', '^browser/managed_mode/'], | 2618 ['exclude', '^browser/managed_mode/'], |
| 2629 ], | 2619 ], |
| 2630 }], | 2620 }], |
| 2631 ['safe_browsing!=1', { | 2621 ['safe_browsing!=1', { |
| 2632 'sources/': [ | 2622 'sources/': [ |
| 2633 ['exclude', '^browser/extensions/blacklist_unittest.cc'], | 2623 ['exclude', '^browser/extensions/blacklist_unittest.cc'], |
| 2634 ], | 2624 ], |
| 2635 }], | 2625 }], |
| 2626 ['cld_version==0 or cld_version==1', { |
| 2627 'defines': [ |
| 2628 'CLD_WINDOWS', |
| 2629 ], |
| 2630 'direct_dependent_settings': { |
| 2631 'defines': [ |
| 2632 'CLD_WINDOWS', |
| 2633 ], |
| 2634 }, |
| 2635 'sources': [ |
| 2636 '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unit
test_small.cc', |
| 2637 ], |
| 2638 'dependencies': [ |
| 2639 '../third_party/cld/cld.gyp:cld', |
| 2640 ], |
| 2641 }], |
| 2636 ], | 2642 ], |
| 2637 'target_conditions': [ | 2643 'target_conditions': [ |
| 2638 ['OS == "ios"', { | 2644 ['OS == "ios"', { |
| 2639 'sources/': [ | 2645 'sources/': [ |
| 2640 ['include', '^common/mac/nscoder_util_unittest\\.mm$'], | 2646 ['include', '^common/mac/nscoder_util_unittest\\.mm$'], |
| 2641 ], | 2647 ], |
| 2642 }], | 2648 }], |
| 2643 ], | 2649 ], |
| 2644 }, | 2650 }, |
| 2645 { | 2651 { |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2753 # more details. | 2759 # more details. |
| 2754 'DebugInformationFormat': '3', | 2760 'DebugInformationFormat': '3', |
| 2755 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb', | 2761 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb', |
| 2756 }, | 2762 }, |
| 2757 }, | 2763 }, |
| 2758 }, | 2764 }, |
| 2759 ], | 2765 ], |
| 2760 }], | 2766 }], |
| 2761 ], # 'conditions' | 2767 ], # 'conditions' |
| 2762 } | 2768 } |
| OLD | NEW |