Skip to content

Commit f004bde

Browse files
jungshikSlow3000
authored andcommitted
<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 <[email protected]>
1 parent 91bc2da commit f004bde

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

chromium/third_party/icu/icu.gyp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
}, {
7272
'toolsets': ['host', 'target'],
7373
}],
74-
[ 'OS == "win"', {
74+
[ 'OS == "win" and icu_use_data_file_flag==0', {
7575
'type': 'none',
7676
'copies': [
7777
{
@@ -82,28 +82,27 @@
8282
},
8383
],
8484
}],
85-
[ 'OS != "win" and icu_use_data_file_flag', {
85+
[ 'icu_use_data_file_flag', {
8686
# Remove any assembly data file.
8787
'sources/': [['exclude', 'icudt46l_dat']],
8888
# Compile in the stub data symbol.
8989
'sources': ['source/stubdata/stubdata.c'],
90+
9091
# Make sure any binary depending on this gets the data file.
91-
'link_settings': {
92-
'target_conditions': [
93-
['(OS == "mac" and _mac_bundle) or OS=="ios"', {
94-
'mac_bundle_resources': [
92+
'conditions': [
93+
['OS=="ios"', {
94+
'mac_bundle_resources': [
95+
'source/data/in/icudt46l.dat',
96+
],
97+
}, {
98+
'copies': [{
99+
'destination': '<(PRODUCT_DIR)',
100+
'files': [
95101
'source/data/in/icudt46l.dat',
96102
],
97-
}, {
98-
'copies': [{
99-
'destination': '<(PRODUCT_DIR)',
100-
'files': [
101-
'source/data/in/icudt46l.dat',
102-
],
103-
}],
104103
}],
105-
], # target_conditions
106-
}, # link_settings
104+
}],
105+
], # target_condition
107106
}],
108107
],
109108
'target_conditions': [

0 commit comments

Comments
 (0)