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

Unified Diff: chrome/chrome_tests.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: pure rebase 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
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 42de1f5af1c3e15eb300179c2713f71550a84f33..7f479d1a116d9ca0eae4bb93b52c7d7ebebf30cc 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1832,13 +1832,6 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
],
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ],
'msvs_settings': {
'VCLinkerTool': {
'conditions': [
@@ -2424,13 +2417,6 @@
'dependencies': [
'chrome_version_resources',
],
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
}, { # else: OS != "win"
'sources!': [
'app/chrome_command_ids.h',
@@ -2529,15 +2515,6 @@
'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc',
],
}],
- ['os_posix == 1 and OS != "mac" and OS != "android"', {
- 'conditions': [
- ['use_allocator!="none"', {
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ],
- }],
['chromeos == 1', {
'sources': [
'browser/extensions/api/networking_private/networking_private_apitest.cc',
@@ -2754,13 +2731,6 @@
'dependencies': [
'chrome_version_resources',
],
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
'configurations': {
'Debug_Base': {
'msvs_settings': {
@@ -2809,20 +2779,6 @@
'test/perf/mach_ports_performancetest.cc',
],
}],
- ['os_posix == 1 and OS != "mac" and OS != "android"', {
- 'conditions': [
- ['use_allocator!="none"', {
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ],
- }],
- ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
- 'dependencies': [
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
- ],
- }],
], # conditions
}, # target performance_browser_tests
{
@@ -2959,13 +2915,6 @@
'dependencies': [
'chrome_version_resources',
],
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
'configurations': {
'Debug': {
'msvs_settings': {
@@ -3066,13 +3015,6 @@
'dependencies': [
'chrome_version_resources',
],
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
'configurations': {
'Debug': {
'msvs_settings': {
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698