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

Side by Side Diff: extensions/extensions_tests.gyp

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 | « extensions/BUILD.gn ('k') | extensions/shell/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 { 1 {
2 'includes': [ 2 'includes': [
3 'extensions_tests.gypi', 3 'extensions_tests.gypi',
4 ], 4 ],
5 'variables': { 5 'variables': {
6 # Product name is used for Mac bundle. 6 # Product name is used for Mac bundle.
7 'app_shell_product_name': 'App Shell', 7 'app_shell_product_name': 'App Shell',
8 # The version is high enough to be supported by Omaha (at least 31) 8 # The version is high enough to be supported by Omaha (at least 31)
9 # but fake enough to be obviously not a Chrome release. 9 # but fake enough to be obviously not a Chrome release.
10 'app_shell_version': '38.1234.5678.9', 10 'app_shell_version': '38.1234.5678.9',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 # Needed for third_party libraries like leveldb. 47 # Needed for third_party libraries like leveldb.
48 'include_dirs': [ 48 'include_dirs': [
49 '..', 49 '..',
50 ], 50 ],
51 'sources': [ 51 'sources': [
52 '<@(extensions_unittests_sources)', 52 '<@(extensions_unittests_sources)',
53 ], 53 ],
54 # Disable c4267 warnings until we fix size_t to int truncations. 54 # Disable c4267 warnings until we fix size_t to int truncations.
55 'msvs_disabled_warnings': [ 4267, ], 55 'msvs_disabled_warnings': [ 4267, ],
56 'conditions': [ 56 'conditions': [
57 ['OS=="win" and win_use_allocator_shim==1', {
58 'dependencies': [
59 '../base/allocator/allocator.gyp:allocator',
60 ],
61 }],
62 ['chromeos==1', { 57 ['chromeos==1', {
63 'dependencies': [ 58 'dependencies': [
64 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support', 59 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support',
65 ], 60 ],
66 'sources': [ 61 'sources': [
67 'browser/api/webcam_private/visca_webcam_unittest.cc', 62 'browser/api/webcam_private/visca_webcam_unittest.cc',
68 ], 63 ],
69 }], 64 }],
70 ], 65 ],
71 }, 66 },
(...skipping 19 matching lines...) Expand all
91 '<(DEPTH)/testing/gmock.gyp:gmock', 86 '<(DEPTH)/testing/gmock.gyp:gmock',
92 '<(DEPTH)/testing/gtest.gyp:gtest', 87 '<(DEPTH)/testing/gtest.gyp:gtest',
93 ], 88 ],
94 'defines': [ 89 'defines': [
95 'HAS_OUT_OF_PROC_TEST_RUNNER', 90 'HAS_OUT_OF_PROC_TEST_RUNNER',
96 ], 91 ],
97 'sources': [ 92 'sources': [
98 '<@(extensions_browsertests_sources)', 93 '<@(extensions_browsertests_sources)',
99 ], 94 ],
100 'conditions': [ 95 'conditions': [
101 ['OS=="win" and win_use_allocator_shim==1', {
102 'dependencies': [
103 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
104 ],
105 }],
106 ['OS=="mac"', { 96 ['OS=="mac"', {
107 'dependencies': [ 97 'dependencies': [
108 'shell/app_shell.gyp:app_shell', # Needed for App Shell.app's Helpe r. 98 'shell/app_shell.gyp:app_shell', # Needed for App Shell.app's Helpe r.
109 ], 99 ],
110 }], 100 }],
111 # This is only here to keep gyp happy. This target never builds on 101 # This is only here to keep gyp happy. This target never builds on
112 # mobile platforms. 102 # mobile platforms.
113 ['OS != "ios" and OS != "android"', { 103 ['OS != "ios" and OS != "android"', {
114 'dependencies': [ 104 'dependencies': [
115 '<(DEPTH)/components/components.gyp:storage_monitor_test_support', 105 '<(DEPTH)/components/components.gyp:storage_monitor_test_support',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 'dependencies': [ 141 'dependencies': [
152 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 142 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
153 ], 143 ],
154 }], 144 }],
155 ], 145 ],
156 } 146 }
157 ], 147 ],
158 }], 148 }],
159 ], 149 ],
160 } 150 }
OLDNEW
« no previous file with comments | « extensions/BUILD.gn ('k') | extensions/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698