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

Unified Diff: components/components_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: . 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 side-by-side diff with in-line comments
Download patch
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 67066a314cd20a860f9c9aa1de14dc7582133015..69a7b42223d7dc036f25dc0de0537e3aba5e0600 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1154,11 +1154,6 @@
'components.gyp:browser_watcher_client',
]
}],
- ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
- 'dependencies': [
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
- ],
- }],
[ 'cld_version==2', {
'dependencies': [
# Unit tests should always use statically-linked CLD data.
@@ -1456,19 +1451,6 @@
['exclude', '^storage_monitor/'],
],
}],
- ['OS=="win" and win_use_allocator_shim==1', {
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
- 'dependencies': [
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
- ],
- 'link_settings': {
- 'ldflags': ['-rdynamic'],
- },
- }],
['configuration_policy==1', {
'dependencies': [
'components.gyp:policy_component',
@@ -1722,11 +1704,6 @@
'../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.
'msvs_disabled_warnings': [ 4267, ],
@@ -1824,11 +1801,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',
- ],
- }],
['OS=="mac"', {
'dependencies': [
'../content/content_shell_and_tests.gyp:content_shell', # Needed for Content Shell.app's Helper.

Powered by Google App Engine
This is Rietveld 408576698