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 | |
| 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')
| -rw-r--r-- | chrome/chrome_browser.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 100 |
2 files changed, 85 insertions, 23 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. diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 9a64ffa..0c96a6b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -259,9 +259,13 @@ 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], - 'dependencies': [ - '<(allocator_target)', - ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], }], ], }, @@ -398,8 +402,14 @@ 'security_tests', # run time dependency 'test_support_common', '../google_update/google_update.gyp:google_update', - '<(allocator_target)', ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], 'link_settings': { 'libraries': [ '-lOleAcc.lib', @@ -473,8 +483,14 @@ '../views/views.gyp:views', # run time dependency '../webkit/webkit.gyp:npapi_test_plugin', - '<(allocator_target)', ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], 'link_settings': { 'libraries': [ '-lOleAcc.lib', @@ -1215,8 +1231,14 @@ 'installer_util_strings', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 'test_chrome_plugin', # run time dependency - '<(allocator_target)', ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], @@ -1443,8 +1465,14 @@ 'chrome_dll_version', 'installer_util_strings', '../sandbox/sandbox.gyp:sandbox', - '<(allocator_target)', ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], 'configurations': { 'Debug_Base': { 'msvs_settings': { @@ -1574,9 +1602,13 @@ ], }], ['OS=="win"', { - 'dependencies': [ - '<(allocator_target)', - ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], 'configurations': { 'Debug_Base': { 'msvs_settings': { @@ -1627,7 +1659,7 @@ 'test/reliability/run_all_unittests.cc', ], 'conditions': [ - ['OS=="win"', { + ['OS=="win" and win_use_allocator_shim==1', { 'dependencies': [ '<(allocator_target)', ], @@ -1701,7 +1733,7 @@ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], - ['OS=="win"', { + ['OS=="win" and win_use_allocator_shim==1', { 'dependencies': [ '<(allocator_target)', ], @@ -1763,9 +1795,13 @@ 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], - 'dependencies': [ - '<(allocator_target)', - ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], }], # OS="win" ], # conditions }, @@ -1928,8 +1964,12 @@ 'sources' : [ 'browser/sync/util/data_encryption_unittest.cc', ], - 'dependencies': [ - '<(allocator_target)', + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], ], 'link_settings': { 'libraries': [ @@ -2079,7 +2119,13 @@ 'installer_util_strings', '../views/views.gyp:views', '../sandbox/sandbox.gyp:sandbox', - '<(allocator_target)', + ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], ], 'configurations': { 'Debug': { @@ -2118,9 +2164,15 @@ 'conditions': [ ['OS=="win"', { 'dependencies': [ - '<(allocator_target)', 'security_tests', # run time dependency ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], + ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], @@ -2185,8 +2237,12 @@ }, }, }, - 'dependencies': [ - '<(allocator_target)', + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], ], }], ], @@ -2235,7 +2291,7 @@ 'test/selenium/selenium_test.cc', ], 'conditions': [ - ['OS=="win"', { + ['OS=="win" and win_use_allocator_shim==1', { 'dependencies': [ '<(allocator_target)', ], |