Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/installer/setup/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2597 }], 2597 }],
2598 ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', { 2598 ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', {
2599 'configurations': { 2599 'configurations': {
2600 'Release': { 2600 'Release': {
2601 'ldflags': [ 2601 'ldflags': [
2602 '-Wl,--strip-debug', 2602 '-Wl,--strip-debug',
2603 ], 2603 ],
2604 }, 2604 },
2605 }, 2605 },
2606 }], 2606 }],
2607 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
2608 'conditions': [
2609 ['use_allocator!="none"', {
2610 'dependencies': [
2611 '../base/allocator/allocator.gyp:allocator',
2612 ],
2613 }],
2614 ],
2615 }],
2616 ['OS=="mac"', { 2607 ['OS=="mac"', {
2617 # The test fetches resources which means Mac need the app bundle to 2608 # The test fetches resources which means Mac need the app bundle to
2618 # exist on disk so it can pull from it. 2609 # exist on disk so it can pull from it.
2619 'dependencies': [ 2610 'dependencies': [
2620 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac', 2611 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac',
2621 '../third_party/ocmock/ocmock.gyp:ocmock', 2612 '../third_party/ocmock/ocmock.gyp:ocmock',
2622 'chrome', 2613 'chrome',
2623 ], 2614 ],
2624 'sources': [ '<@(chrome_unit_tests_mac_sources)' ], 2615 'sources': [ '<@(chrome_unit_tests_mac_sources)' ],
2625 'sources!': [ 2616 'sources!': [
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
2693 'dependencies': [ 2684 'dependencies': [
2694 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_1', 2685 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_1',
2695 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_2', 2686 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_2',
2696 'chrome_version_resources', 2687 'chrome_version_resources',
2697 'installer_util_strings', 2688 'installer_util_strings',
2698 '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_1', 2689 '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_1',
2699 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2690 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2700 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2691 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2701 ], 2692 ],
2702 'conditions': [ 2693 'conditions': [
2703 ['win_use_allocator_shim==1', {
2704 'dependencies': [
2705 '<(allocator_target)',
2706 ],
2707 }],
2708 ['branding!="Chrome"', { 2694 ['branding!="Chrome"', {
2709 'sources!': [ 2695 'sources!': [
2710 'browser/google/google_update_win_unittest.cc', 2696 'browser/google/google_update_win_unittest.cc',
2711 ], 2697 ],
2712 }], 2698 }],
2713 ], 2699 ],
2714 'include_dirs': [ 2700 'include_dirs': [
2715 '<(DEPTH)/third_party/wtl/include', 2701 '<(DEPTH)/third_party/wtl/include',
2716 ], 2702 ],
2717 'sources': [ 2703 'sources': [
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2919 # but when we tried to pull it up to the common.gypi level, it broke 2905 # but when we tried to pull it up to the common.gypi level, it broke
2920 # other things like the ui and startup tests. *shrug* 2906 # other things like the ui and startup tests. *shrug*
2921 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2907 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2922 }], 2908 }],
2923 ['OS=="win"', { 2909 ['OS=="win"', {
2924 'dependencies': [ 2910 'dependencies': [
2925 # breakpad is currently only tested on Windows. 2911 # breakpad is currently only tested on Windows.
2926 '../breakpad/breakpad.gyp:*', 2912 '../breakpad/breakpad.gyp:*',
2927 '../components/components.gyp:crash_component', 2913 '../components/components.gyp:crash_component',
2928 ], 2914 ],
2929 'conditions': [
2930 ['win_use_allocator_shim==1', {
2931 'dependencies': [
2932 '<(allocator_target)',
2933 ],
2934 }],
2935 ],
2936 }], 2915 }],
2937 ], 2916 ],
2938 }, 2917 },
2939 { 2918 {
2940 # Protobuf compiler / generator for IPC protobuf message tests. 2919 # Protobuf compiler / generator for IPC protobuf message tests.
2941 2920
2942 # GN version: //chrome/test:test_proto 2921 # GN version: //chrome/test:test_proto
2943 'target_name': 'ipc_protobuf_message_test_proto', 2922 'target_name': 'ipc_protobuf_message_test_proto',
2944 'type': 'static_library', 2923 'type': 'static_library',
2945 'sources': [ 2924 'sources': [
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
3055 'dependencies': [ 3034 'dependencies': [
3056 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3035 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3057 ], 3036 ],
3058 }], 3037 }],
3059 ], 3038 ],
3060 }, 3039 },
3061 ], 3040 ],
3062 }], 3041 }],
3063 ], # 'conditions' 3042 ], # 'conditions'
3064 } 3043 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/installer/setup/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698