| 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 'variables': { | 5 'variables': { |
| 6 'chrome_unit_tests_sources': [ | 6 'chrome_unit_tests_sources': [ |
| 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this | 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this |
| 8 # dependency is needed to make commit bots run unit_tests on | 8 # dependency is needed to make commit bots run unit_tests on |
| 9 # histograms.xml changes. | 9 # histograms.xml changes. |
| 10 '../tools/metrics/histograms/histograms.xml', | 10 '../tools/metrics/histograms/histograms.xml', |
| (...skipping 2214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2225 '../testing/gmock.gyp:gmock', | 2225 '../testing/gmock.gyp:gmock', |
| 2226 '../testing/gtest.gyp:gtest', | 2226 '../testing/gtest.gyp:gtest', |
| 2227 'test_support_common', | 2227 'test_support_common', |
| 2228 'test_support_unit', | 2228 'test_support_unit', |
| 2229 # 3) anything tests directly depend on | 2229 # 3) anything tests directly depend on |
| 2230 '../components/components.gyp:generate_version_info', | 2230 '../components/components.gyp:generate_version_info', |
| 2231 '../courgette/courgette.gyp:courgette_lib', | 2231 '../courgette/courgette.gyp:courgette_lib', |
| 2232 '../google_apis/google_apis.gyp:google_apis', | 2232 '../google_apis/google_apis.gyp:google_apis', |
| 2233 '../skia/skia.gyp:skia', | 2233 '../skia/skia.gyp:skia', |
| 2234 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
n', | 2234 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
n', |
| 2235 # Unit tests should be independent of the CLD2 access mechanism, |
| 2236 # just use static for simplicity. |
| 2237 '../third_party/cld_2/cld_2.gyp:cld2_static', |
| 2235 '../third_party/icu/icu.gyp:icui18n', | 2238 '../third_party/icu/icu.gyp:icui18n', |
| 2236 '../third_party/icu/icu.gyp:icuuc', | 2239 '../third_party/icu/icu.gyp:icuuc', |
| 2237 '../third_party/libxml/libxml.gyp:libxml', | 2240 '../third_party/libxml/libxml.gyp:libxml', |
| 2238 '../ui/base/ui_base.gyp:ui_base_test_support', | 2241 '../ui/base/ui_base.gyp:ui_base_test_support', |
| 2239 '../ui/gfx/gfx.gyp:gfx_test_support', | 2242 '../ui/gfx/gfx.gyp:gfx_test_support', |
| 2240 '../ui/resources/ui_resources.gyp:ui_resources', | 2243 '../ui/resources/ui_resources.gyp:ui_resources', |
| 2241 'chrome_features.gyp:chrome_common_features', | 2244 'chrome_features.gyp:chrome_common_features', |
| 2242 'chrome_resources.gyp:chrome_resources', | 2245 'chrome_resources.gyp:chrome_resources', |
| 2243 'chrome_resources.gyp:chrome_strings', | 2246 'chrome_resources.gyp:chrome_strings', |
| 2244 ], | 2247 ], |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2520 'browser/signin/signin_manager_unittest.cc', | 2523 'browser/signin/signin_manager_unittest.cc', |
| 2521 'browser/signin/signin_names_io_thread_unittest.cc', | 2524 'browser/signin/signin_names_io_thread_unittest.cc', |
| 2522 ], | 2525 ], |
| 2523 }], | 2526 }], |
| 2524 ['use_x11==1', { | 2527 ['use_x11==1', { |
| 2525 'dependencies': [ | 2528 'dependencies': [ |
| 2526 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2529 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2527 '../ui/events/devices/events_devices.gyp:events_devices', | 2530 '../ui/events/devices/events_devices.gyp:events_devices', |
| 2528 ], | 2531 ], |
| 2529 }], | 2532 }], |
| 2530 [ 'cld_version==2', { | |
| 2531 'dependencies': [ | |
| 2532 # Unit tests should be independent of the CLD2 access mechanism, | |
| 2533 # just use static for simplicity. | |
| 2534 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ], | |
| 2535 }], | |
| 2536 ['OS=="linux"', { | 2533 ['OS=="linux"', { |
| 2537 'dependencies': [ | 2534 'dependencies': [ |
| 2538 '../build/linux/system.gyp:ssl', | 2535 '../build/linux/system.gyp:ssl', |
| 2539 ], | 2536 ], |
| 2540 }], | 2537 }], |
| 2541 # Only add this test for 64 bit builds because otherwise we need the 32 | 2538 # Only add this test for 64 bit builds because otherwise we need the 32 |
| 2542 # bit library on 64 bit systems when running this test. | 2539 # bit library on 64 bit systems when running this test. |
| 2543 ['use_gnome_keyring == 1 and target_arch=="x64"', { | 2540 ['use_gnome_keyring == 1 and target_arch=="x64"', { |
| 2544 'sources': [ | 2541 'sources': [ |
| 2545 'browser/password_manager/native_backend_gnome_x_unittest.cc', | 2542 'browser/password_manager/native_backend_gnome_x_unittest.cc', |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2727 'sources': [ '<@(chrome_unit_tests_supervised_user_sources)' ], | 2724 'sources': [ '<@(chrome_unit_tests_supervised_user_sources)' ], |
| 2728 }], | 2725 }], |
| 2729 ['enable_supervised_users == 1 and OS != "android" and OS != "ios"', { | 2726 ['enable_supervised_users == 1 and OS != "android" and OS != "ios"', { |
| 2730 'sources': [ '<@(chrome_unit_tests_supervised_user_legacy_sources)' ], | 2727 'sources': [ '<@(chrome_unit_tests_supervised_user_legacy_sources)' ], |
| 2731 }], | 2728 }], |
| 2732 ['safe_browsing==1 and enable_extensions==1', { | 2729 ['safe_browsing==1 and enable_extensions==1', { |
| 2733 'sources': [ | 2730 'sources': [ |
| 2734 'browser/extensions/blacklist_unittest.cc', | 2731 'browser/extensions/blacklist_unittest.cc', |
| 2735 ], | 2732 ], |
| 2736 }], | 2733 }], |
| 2737 ['cld_version==1', { | |
| 2738 'defines': [ | |
| 2739 'CLD_WINDOWS', | |
| 2740 ], | |
| 2741 'direct_dependent_settings': { | |
| 2742 'defines': [ | |
| 2743 'CLD_WINDOWS', | |
| 2744 ], | |
| 2745 }, | |
| 2746 'sources': [ | |
| 2747 '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unit
test_small.cc', | |
| 2748 ], | |
| 2749 'dependencies': [ | |
| 2750 '../third_party/cld/cld.gyp:cld', | |
| 2751 ], | |
| 2752 }], | |
| 2753 ['enable_app_list==1', { | 2734 ['enable_app_list==1', { |
| 2754 'sources': [ '<@(chrome_unit_tests_app_list_sources)' ], | 2735 'sources': [ '<@(chrome_unit_tests_app_list_sources)' ], |
| 2755 'dependencies': [ | 2736 'dependencies': [ |
| 2756 '../ui/app_list/app_list.gyp:app_list_test_support', | 2737 '../ui/app_list/app_list.gyp:app_list_test_support', |
| 2757 ], | 2738 ], |
| 2758 }], | 2739 }], |
| 2759 ['enable_app_list==1 and chromeos==1', { | 2740 ['enable_app_list==1 and chromeos==1', { |
| 2760 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ], | 2741 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ], |
| 2761 }], | 2742 }], |
| 2762 ['enable_app_list==1 and chromeos==1', { | 2743 ['enable_app_list==1 and chromeos==1', { |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3012 'dependencies': [ | 2993 'dependencies': [ |
| 3013 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2994 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 3014 ], | 2995 ], |
| 3015 }], | 2996 }], |
| 3016 ], | 2997 ], |
| 3017 }, | 2998 }, |
| 3018 ], | 2999 ], |
| 3019 }], | 3000 }], |
| 3020 ], # 'conditions' | 3001 ], # 'conditions' |
| 3021 } | 3002 } |
| OLD | NEW |