Commit eec0e16f authored by hans's avatar hans Committed by Commit bot

Add more allocator.gyp:allocator dependencies

The dependency is necessary to avoid multiple definitions of memory
allocation functions in static_library Debug builds on Windows.

BUG=429498
NOTRY=true

Review URL: https://codereview.chromium.org/695913003

Cr-Commit-Position: refs/heads/master@{#302663}
parent 365da319
...@@ -1254,6 +1254,11 @@ ...@@ -1254,6 +1254,11 @@
'../device/bluetooth/bluetooth.gyp:device_bluetooth', '../device/bluetooth/bluetooth.gyp:device_bluetooth',
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], ],
}, },
{ {
...@@ -1281,6 +1286,11 @@ ...@@ -1281,6 +1286,11 @@
'../ui/display/display.gyp:display', '../ui/display/display.gyp:display',
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], ],
}, },
], ],
......
...@@ -2578,6 +2578,11 @@ ...@@ -2578,6 +2578,11 @@
}], }],
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], # conditions ], # conditions
}, # target performance_browser_tests }, # target performance_browser_tests
{ {
......
...@@ -476,6 +476,11 @@ ...@@ -476,6 +476,11 @@
'components.gyp:constrained_window', 'components.gyp:constrained_window',
] ]
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
['OS != "ios"', { ['OS != "ios"', {
'sources': [ 'sources': [
'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc', 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',
...@@ -881,6 +886,11 @@ ...@@ -881,6 +886,11 @@
'../testing/android/native_test.gyp:native_test_native_code', '../testing/android/native_test.gyp:native_test_native_code',
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ], 'msvs_disabled_warnings': [ 4267, ],
......
...@@ -1074,6 +1074,11 @@ ...@@ -1074,6 +1074,11 @@
'../testing/android/native_test.gyp:native_test_native_code', '../testing/android/native_test.gyp:native_test_native_code',
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], ],
}, },
{ {
...@@ -1452,6 +1457,11 @@ ...@@ -1452,6 +1457,11 @@
'../third_party/mesa/mesa.gyp:osmesa', '../third_party/mesa/mesa.gyp:osmesa',
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], ],
}, },
{ {
...@@ -1474,6 +1484,13 @@ ...@@ -1474,6 +1484,13 @@
'sources': [ 'sources': [
'common/gpu/client/gl_helper_benchmark.cc', 'common/gpu/client/gl_helper_benchmark.cc',
], ],
'conditions': [
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
],
}, },
], ],
}], }],
......
...@@ -353,6 +353,11 @@ ...@@ -353,6 +353,11 @@
'../../content/content.gyp:content_startup_helper_win', '../../content/content.gyp:content_startup_helper_win',
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], ],
}, },
], ],
......
...@@ -189,6 +189,11 @@ ...@@ -189,6 +189,11 @@
'../../../content/content.gyp:content_startup_helper_win', '../../../content/content.gyp:content_startup_helper_win',
], ],
}], }],
['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
], ],
}, # target_name: views_examples_with_content_exe }, # target_name: views_examples_with_content_exe
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment