diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 19:18:43 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 19:18:43 +0000 |
| commit | ba6dd29f30451b12566641bad7fa58ca7e3fe6bc (patch) | |
| tree | 9004e1b3df1e4e7d625fd2164aec02d6cd21af4e /base/base.gyp | |
| parent | fb4eb867ed64c283aeb66497528e210c7dadbdcb (diff) | |
| download | chromium_src-ba6dd29f30451b12566641bad7fa58ca7e3fe6bc.zip chromium_src-ba6dd29f30451b12566641bad7fa58ca7e3fe6bc.tar.gz chromium_src-ba6dd29f30451b12566641bad7fa58ca7e3fe6bc.tar.bz2 | |
Enable icu_use_data_file on Windows
Set icu_use_data_file_flag to 1 on Windows in common.gypi and make the dependency on icudata conditional on 'icu_use_data_file_flag != 0' in common.gypi, base.gyp and net.gyp
This also requires a change in third_party/icu/icu.gyp
( https://codereview.chromium.org/111723007/ ), which was rolled in by https://codereview.chromium.org/118313004/
BUG=72633
TEST=All windows builds work fine and there's no perf regression (start-up etc).
Review URL: https://codereview.chromium.org/99473012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/base/base.gyp b/base/base.gyp index a989933..1a41812 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -761,11 +761,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', @@ -776,17 +771,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': [ |