Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: icu.gyp

Issue 118373006: Add back link_settings for iOS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/icu46/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"))', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698