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

Unified Diff: components/components_tests.gyp

Issue 695913003: Add more allocator.gyp:allocator dependencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix two more; now i can build 'all' in 32-bit Created 6 years, 1 month 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_tests.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index d18cb65f571a31492b33a566c275d071e247f7b1..87730603624fb31ecf6b4a2c90944c0ed6e966d3 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -476,6 +476,11 @@
'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"', {
'sources': [
'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',
@@ -881,6 +886,11 @@
'../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, ],
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698