diff options
| author | jshin@chromium.org <jshin@chromium.org> | 2013-12-18 18:03:33 +0000 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-06-12 17:22:41 +0200 |
| commit | f004bde584ee3c5033802350bf62cc6829dcf070 (patch) | |
| tree | f82abbee2c531cfe95b8ffe48882e5ed5874c1dd | |
| parent | 91bc2da61f6ea5617bf0161f65a9b36de93783f8 (diff) | |
| download | qtwebengine-chromium-f004bde584ee3c5033802350bf62cc6829dcf070.tar.gz | |
<third_party/icu> [Backport] Add support for icu_use_data_file=1 to icu.gyp on Windows
BUG=72633
Review URL: https://codereview.chromium.org/111723007
Change-Id: If07088b902b8039ee109e744e46199fd9d13dc46
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | chromium/third_party/icu/icu.gyp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/chromium/third_party/icu/icu.gyp b/chromium/third_party/icu/icu.gyp index 416050d66d8..0ccd6577ac9 100644 --- a/chromium/third_party/icu/icu.gyp +++ b/chromium/third_party/icu/icu.gyp @@ -71,7 +71,7 @@ }, { 'toolsets': ['host', 'target'], }], - [ 'OS == "win"', { + [ 'OS == "win" and icu_use_data_file_flag==0', { 'type': 'none', 'copies': [ { @@ -82,28 +82,27 @@ }, ], }], - [ 'OS != "win" and icu_use_data_file_flag', { + [ 'icu_use_data_file_flag', { # Remove any assembly data file. 'sources/': [['exclude', 'icudt46l_dat']], # Compile in the stub data symbol. 'sources': ['source/stubdata/stubdata.c'], + # Make sure any binary depending on this gets the data file. - 'link_settings': { - 'target_conditions': [ - ['(OS == "mac" and _mac_bundle) or OS=="ios"', { - 'mac_bundle_resources': [ + 'conditions': [ + ['OS=="ios"', { + 'mac_bundle_resources': [ + 'source/data/in/icudt46l.dat', + ], + }, { + 'copies': [{ + 'destination': '<(PRODUCT_DIR)', + 'files': [ 'source/data/in/icudt46l.dat', ], - }, { - 'copies': [{ - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'source/data/in/icudt46l.dat', - ], - }], }], - ], # target_conditions - }, # link_settings + }], + ], # target_condition }], ], 'target_conditions': [ |