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: ash/ash.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 | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 9397963f19723c614b0655837fa5339726130033..1364acb22bdc85e67c7615a7676a16542806014b 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -1251,6 +1251,11 @@
'../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',
+ ],
+ }],
],
},
{
@@ -1278,6 +1283,11 @@
'../ui/display/display.gyp:display',
],
}],
+ ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
],
},
],
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698