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

Unified Diff: chrome/chrome_browser.gypi

Issue 2842021: Fix the allocator dependency to respect win_use_allocator_shim variable.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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 | « 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: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi (revision 50869)
+++ chrome/chrome_browser.gypi (working copy)
@@ -2976,7 +2976,6 @@
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../views/views.gyp:views',
'../rlz/rlz.gyp:rlz_lib',
- '<(allocator_target)',
],
'export_dependent_settings': [
'../views/views.gyp:views',
@@ -2994,6 +2993,13 @@
'browser/power_save_blocker_stub.cc',
'browser/views/select_file_dialog.cc',
],
+ 'conditions': [
+ ['win_use_allocator_shim==1', {
+ 'dependencies': [
+ '<(allocator_target)',
+ ],
+ }],
+ ],
}, { # 'OS!="win"
'sources/': [
# Exclude all of hang_monitor.
« 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