Chromium Code Reviews| Index: icu.gyp |
| =================================================================== |
| --- icu.gyp (revision 241597) |
| +++ icu.gyp (working copy) |
| @@ -89,12 +89,17 @@ |
| 'sources': ['source/stubdata/stubdata.c'], |
| # Make sure any binary depending on this gets the data file. |
| + 'link_settings': { |
| + 'conditions': [ |
| + ['OS == "ios"', { |
| + 'mac_bundle_resources': [ |
| + 'source/data/in/icudtl.dat', |
| + ], |
| + }], |
| + ], |
| + }, # link_settings |
| 'conditions': [ |
|
Mark Mentovai
2013/12/18 23:31:29
Why don’t you just make it one conditional with an
|
| - ['OS=="ios"', { |
| - 'mac_bundle_resources': [ |
| - 'source/data/in/icudtl.dat', |
| - ], |
| - }, { |
| + ['OS != "ios"', { |
| 'copies': [{ |
| 'destination': '<(PRODUCT_DIR)', |
| 'files': [ |
| @@ -102,9 +107,9 @@ |
| ], |
| }], |
| }], |
| - ], # target_conditions |
| - }], |
| - ], |
| + ], # OS != ios |
| + }], # 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"))', { |