diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 20:43:12 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 20:43:12 +0000 |
| commit | da26d737133f31b8abdf71311e9157a517821fda (patch) | |
| tree | 6c102a08901e42472ed3e4cba786f022b842d27f /chrome/chrome_browser.gypi | |
| parent | 715d128247ca265058fd40dc16bf57c66bce9fcc (diff) | |
| download | chromium_src-da26d737133f31b8abdf71311e9157a517821fda.zip chromium_src-da26d737133f31b8abdf71311e9157a517821fda.tar.gz chromium_src-da26d737133f31b8abdf71311e9157a517821fda.tar.bz2 | |
Fix the allocator dependency to respect win_use_allocator_shim variable.
R=maruel
BUG=46311
TEST=none
Review URL: http://codereview.chromium.org/2842021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index c7372ca..eebf03b 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -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. |