Add back link_settings for iOS.
In https://codereview.chromium.org/111723007, link_settings was dropped on
all platforms including iOS. iOS does need link_settings (see
post-checkin comments in the CL aforementioned).
BUG=72633
TEST=Once this is rolled in, ios* bots pass *unittests without an error in loading icudtl.dat.
R=mark@chromium.org
Review URL: https://codereview.chromium.org/118373006
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu46@241739 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/icu.gyp b/icu.gyp
index 56e13aa..d8d79f0 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -90,21 +90,23 @@
# Make sure any binary depending on this gets the data file.
'conditions': [
- ['OS=="ios"', {
- 'mac_bundle_resources': [
- 'source/data/in/icudtl.dat',
- ],
- }, {
+ ['OS != "ios"', {
'copies': [{
'destination': '<(PRODUCT_DIR)',
'files': [
'source/data/in/icudtl.dat',
],
}],
- }],
- ], # target_conditions
- }],
- ],
+ } , { # else: OS=="ios"
+ 'link_settings': {
+ 'mac_bundle_resources': [
+ 'source/data/in/icudtl.dat',
+ ],
+ },
+ }], # OS!=ios
+ ], # conditions
+ }], # icu_use_data_file_flag
+ ], # conditions
'target_conditions': [
[ 'OS == "win" or OS == "mac" or OS == "ios" or '
'(OS == "android" and (_toolset == "target" or host_os != "linux"))', {
