summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 17:43:48 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 17:43:48 +0000
commitabff1afba5fe660893cef3080fd3c270ff8035d8 (patch)
treecb662565b4620908e1986d8514e048c0e3b51099 /build
parent13d13832b62ba18de11342d299444ceaf1268d75 (diff)
downloadchromium_src-abff1afba5fe660893cef3080fd3c270ff8035d8.zip
chromium_src-abff1afba5fe660893cef3080fd3c270ff8035d8.tar.gz
chromium_src-abff1afba5fe660893cef3080fd3c270ff8035d8.tar.bz2
Revert of Enable icu_use_data_file on Windows (https://codereview.chromium.org/99473012/)
Reason for revert: mini_installer somehow does not install icudtl.dat in the top product directory (alongside chrome.exe) leading to a failure in InitializeICU(). icudtl.dat is listed in both mini_installer.gypi and FILES.cfg for windows. Original issue's description: > 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). > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246387 TBR=mark@chromium.org,scottmg@chromium.org,laforge@chromium.org,maruel@chromium.org,grt@chromium.org,wtc@chromium.org NOTREECHECKS=true NOTRY=true BUG=72633 Review URL: https://codereview.chromium.org/139403006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 200cc97..ae53af2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1287,7 +1287,6 @@
}],
['OS=="win"', {
'windows_driver_kit_path%': '$(WDK_DIR)',
- 'icu_use_data_file_flag%': 1,
}],
['os_posix==1 and OS!="mac" and OS!="ios"', {
'conditions': [