summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 19:18:43 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 19:18:43 +0000
commitba6dd29f30451b12566641bad7fa58ca7e3fe6bc (patch)
tree9004e1b3df1e4e7d625fd2164aec02d6cd21af4e /build
parentfb4eb867ed64c283aeb66497528e210c7dadbdcb (diff)
downloadchromium_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 'build')
-rw-r--r--build/common.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 7bf928d..6bcbfb1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1288,6 +1288,7 @@
}],
['OS=="win"', {
'windows_driver_kit_path%': '$(WDK_DIR)',
+ 'icu_use_data_file_flag%': 1,
}],
['os_posix==1 and OS!="mac" and OS!="ios"', {
'conditions': [