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

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: . Created 4 years, 11 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
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 2589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2600 }], 2600 }],
2601 ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', { 2601 ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', {
2602 'configurations': { 2602 'configurations': {
2603 'Release': { 2603 'Release': {
2604 'ldflags': [ 2604 'ldflags': [
2605 '-Wl,--strip-debug', 2605 '-Wl,--strip-debug',
2606 ], 2606 ],
2607 }, 2607 },
2608 }, 2608 },
2609 }], 2609 }],
2610 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
2611 'conditions': [
2612 ['use_allocator!="none"', {
2613 'dependencies': [
2614 '../base/allocator/allocator.gyp:allocator',
2615 ],
2616 }],
2617 ],
2618 }],
2619 ['OS=="mac"', { 2610 ['OS=="mac"', {
2620 # The test fetches resources which means Mac need the app bundle to 2611 # The test fetches resources which means Mac need the app bundle to
2621 # exist on disk so it can pull from it. 2612 # exist on disk so it can pull from it.
2622 'dependencies': [ 2613 'dependencies': [
2623 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac', 2614 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac',
2624 '../third_party/ocmock/ocmock.gyp:ocmock', 2615 '../third_party/ocmock/ocmock.gyp:ocmock',
2625 'chrome', 2616 'chrome',
2626 ], 2617 ],
2627 'sources': [ '<@(chrome_unit_tests_mac_sources)' ], 2618 'sources': [ '<@(chrome_unit_tests_mac_sources)' ],
2628 'sources!': [ 2619 'sources!': [
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
2696 'dependencies': [ 2687 'dependencies': [
2697 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_1', 2688 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_1',
2698 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_2', 2689 'browser/safe_browsing/incident_reporting/verifier_test/verifier_uni ttest.gyp:verifier_test_dll_2',
2699 'chrome_version_resources', 2690 'chrome_version_resources',
2700 'installer_util_strings', 2691 'installer_util_strings',
2701 '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_1', 2692 '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_1',
2702 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2693 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2703 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2694 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2704 ], 2695 ],
2705 'conditions': [ 2696 'conditions': [
2706 ['win_use_allocator_shim==1', {
2707 'dependencies': [
2708 '<(allocator_target)',
2709 ],
2710 }],
2711 ['branding!="Chrome"', { 2697 ['branding!="Chrome"', {
2712 'sources!': [ 2698 'sources!': [
2713 'browser/google/google_update_win_unittest.cc', 2699 'browser/google/google_update_win_unittest.cc',
2714 ], 2700 ],
2715 }], 2701 }],
2716 ], 2702 ],
2717 'include_dirs': [ 2703 'include_dirs': [
2718 '<(DEPTH)/third_party/wtl/include', 2704 '<(DEPTH)/third_party/wtl/include',
2719 ], 2705 ],
2720 'sources': [ 2706 'sources': [
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2922 # but when we tried to pull it up to the common.gypi level, it broke 2908 # but when we tried to pull it up to the common.gypi level, it broke
2923 # other things like the ui and startup tests. *shrug* 2909 # other things like the ui and startup tests. *shrug*
2924 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2910 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2925 }], 2911 }],
2926 ['OS=="win"', { 2912 ['OS=="win"', {
2927 'dependencies': [ 2913 'dependencies': [
2928 # breakpad is currently only tested on Windows. 2914 # breakpad is currently only tested on Windows.
2929 '../breakpad/breakpad.gyp:*', 2915 '../breakpad/breakpad.gyp:*',
2930 '../components/components.gyp:crash_component', 2916 '../components/components.gyp:crash_component',
2931 ], 2917 ],
2932 'conditions': [
2933 ['win_use_allocator_shim==1', {
2934 'dependencies': [
2935 '<(allocator_target)',
2936 ],
2937 }],
2938 ],
2939 }], 2918 }],
2940 ], 2919 ],
2941 }, 2920 },
2942 { 2921 {
2943 # Protobuf compiler / generator for IPC protobuf message tests. 2922 # Protobuf compiler / generator for IPC protobuf message tests.
2944 2923
2945 # GN version: //chrome/test:test_proto 2924 # GN version: //chrome/test:test_proto
2946 'target_name': 'ipc_protobuf_message_test_proto', 2925 'target_name': 'ipc_protobuf_message_test_proto',
2947 'type': 'static_library', 2926 'type': 'static_library',
2948 'sources': [ 2927 'sources': [
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
3058 'dependencies': [ 3037 'dependencies': [
3059 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3038 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3060 ], 3039 ],
3061 }], 3040 }],
3062 ], 3041 ],
3063 }, 3042 },
3064 ], 3043 ],
3065 }], 3044 }],
3066 ], # 'conditions' 3045 ], # 'conditions'
3067 } 3046 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698