diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 05:21:53 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 05:21:53 +0000 |
| commit | 31a8825bab0ddfb7da147302f2646632ac63c18a (patch) | |
| tree | 93c56f1e40642eb97f04bb9475b1589bd22a03d9 /chrome/chrome.isolate | |
| parent | ebee09d23a5f7e3cb8b82c48c0abbb2e58e44987 (diff) | |
| download | chromium_src-31a8825bab0ddfb7da147302f2646632ac63c18a.zip chromium_src-31a8825bab0ddfb7da147302f2646632ac63c18a.tar.gz chromium_src-31a8825bab0ddfb7da147302f2646632ac63c18a.tar.bz2 | |
Include icu.isolate instead of listing icudt.dll
icu.isolate file added in https://codereview.chromium.org/99073008/
is used where icudt.dll is directly listed for
'isolate_dependency_tracked'.
icu.isolate includes either icudtl.dat or icudt.dll depending on
'OS' and 'icu_use_data_file_flag'.
Besides, 'icu_use_data_file_flag' is added to build/isolate.gypi as a
config-variable.
Once the above icu-side CL is checked in, this CL will also includes
icu DEPS roll.
This is a prerequisite for the following CLs to use icudtl.dat :
Windows : https://codereview.chromium.org/99473012
Linux : https://codereview.chromium.org/102413007
Mac : https://codereview.chromium.org/109013004
BUG=72633
TEST=All tests utilizing isolate pass on bots.
Review URL: https://codereview.chromium.org/124143002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.isolate')
| -rw-r--r-- | chrome/chrome.isolate | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 2c4d44b..cc09a26 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -69,7 +69,6 @@ '<(PRODUCT_DIR)/clearkeycdmadapter.dll', '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', - '<(PRODUCT_DIR)/icudt.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)', @@ -79,4 +78,7 @@ }, }], ], + 'includes': [ + '../third_party/icu/icu.isolate', + ], } |