summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 20:38:52 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 20:38:52 +0000
commit006c4d5f8e3faf4c63b3a69db972d8e05da243c6 (patch)
tree99bdff6845b46357ad06cc3dd5cc83b6284dea15 /chrome/installer
parent042862e4340aaa67521fd6246980f724de3a902b (diff)
downloadchromium_src-006c4d5f8e3faf4c63b3a69db972d8e05da243c6.zip
chromium_src-006c4d5f8e3faf4c63b3a69db972d8e05da243c6.tar.gz
chromium_src-006c4d5f8e3faf4c63b3a69db972d8e05da243c6.tar.bz2
Use the icu data file on Linux (but not on CrOS)
Set icu_use_data_file_flag to 1 for POSIX (other than Mac/iOS/Android). Mac and Android will be handled in a separate CL. This has to wait until https://codereview.chromium.org/111723007/ is rolled in. (done by https://codereview.chromium.org/118313004/ ) BUG=72633 TEST=All linux builds go through and all tests pass and there's no perf (start-up etc) regression. Review URL: https://codereview.chromium.org/102413007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/linux/common/installer.include4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 962fd86..9123a6e 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -132,6 +132,10 @@ stage_install_common() {
install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
fi
+ # ICU data file; only necessary when icu_use_data_file_flag is set to 1
+ # in build/common.gypi.
+ install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
+
# sandbox
# Rename sandbox binary with hyphen instead of underscore because that's what
# the code looks for, but the build targets can't use hyphens (scons bug?)