diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 20:37:35 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 20:37:35 +0000 |
| commit | 3867c39a48aa93f4fd9baac1af170c31ba66eb43 (patch) | |
| tree | 6fd53ee16e4e61fc97f4db70a33acb946f5a85db | |
| parent | 79e05ea2b019adc1650fb768035648fa700dd8f3 (diff) | |
| download | chromium_src-3867c39a48aa93f4fd9baac1af170c31ba66eb43.zip chromium_src-3867c39a48aa93f4fd9baac1af170c31ba66eb43.tar.gz chromium_src-3867c39a48aa93f4fd9baac1af170c31ba66eb43.tar.bz2 | |
Fix nacl_sandbox_tests dependency:
allocator target should be added as dependency only when
win_use_allocator_shim is 1.
Also fix a typo in allocator_shim.cc
R=jvoung@google.com, mbelshe@chromium.org
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3011011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52947 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/allocator/allocator_shim.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc index 39161d4..3935737 100644 --- a/base/allocator/allocator_shim.cc +++ b/base/allocator/allocator_shim.cc @@ -88,7 +88,7 @@ inline bool call_new_handler(bool nothrow) { } catch (const std::bad_alloc&) { if (!nothrow) throw; - return p; + return true; } #endif // (defined(__GNUC__) && !defined(__EXCEPTIONS)) || (defined(_HAS_EXCEPTIONS) && !_HAS_EXCEPTIONS) } diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 5ecd2ce..3152b6d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -516,7 +516,13 @@ '../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': [ |