diff options
Diffstat (limited to 'chromium/base/base.gyp')
| -rw-r--r-- | chromium/base/base.gyp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp index b5af9d76e1a..74edba8e338 100644 --- a/chromium/base/base.gyp +++ b/chromium/base/base.gyp @@ -795,11 +795,6 @@ }, ], ['OS == "win"', { - # This is needed to trigger the dll copy step on windows. - # TODO(mark): This should not be necessary. - 'dependencies': [ - '../third_party/icu/icu.gyp:icudata', - ], 'sources!': [ 'file_descriptor_shuffle_unittest.cc', 'files/dir_reader_posix_unittest.cc', @@ -810,17 +805,24 @@ 'msvs_disabled_warnings': [ 4267, ], - # This is needed so base_unittests uses the allocator shim, as - # SecurityTest.MemoryAllocationRestriction* tests are dependent - # on tcmalloc. - # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into - # their own test suite. 'conditions': [ + # This is needed so base_unittests uses the allocator shim, as + # SecurityTest.MemoryAllocationRestriction* tests are dependent + # on tcmalloc. + # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into + # their own test suite. ['win_use_allocator_shim==1', { 'dependencies': [ 'allocator/allocator.gyp:allocator', ], }], + ['icu_use_data_file_flag==0', { + # This is needed to trigger the dll copy step on windows. + # TODO(mark): This should not be necessary. + 'dependencies': [ + '../third_party/icu/icu.gyp:icudata', + ], + }], ], }, { # OS != "win" 'dependencies': [ |