summaryrefslogtreecommitdiffstats
path: root/ash/ash.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'ash/ash.gyp')
-rw-r--r--ash/ash.gyp18
1 files changed, 0 insertions, 18 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 24b3f9e..32c8b35 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -1213,11 +1213,6 @@
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
}],
- ['OS=="win" and win_use_allocator_shim==1', {
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
['chromeos==1', {
'dependencies': [
'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
@@ -1240,14 +1235,6 @@
'touch/touchscreen_util_unittest.cc',
],
}],
- ['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
- 'dependencies': [
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
- ],
- 'link_settings': {
- 'ldflags': ['-rdynamic'],
- },
- }],
],
},
{
@@ -1335,11 +1322,6 @@
'../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',
- ],
- }],
],
},
],