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

Unified Diff: content/content_tests.gypi

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 | « components/components_tests.gyp ('k') | ui/app_list/app_list.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 11a5c56891432b932abb2c6ea2bbf87e8a29791f..77a5264b19724bbe78414ca14c7432ce38073c50 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1074,6 +1074,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',
+ ],
+ }],
],
},
{
@@ -1452,6 +1457,11 @@
'../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 @@
'sources': [
'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',
+ ],
+ }],
+ ],
},
],
}],
« no previous file with comments | « components/components_tests.gyp ('k') | ui/app_list/app_list.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698