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

Side by Side 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: addressing review comments and removing tabs 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'use_system_icu%': 0, 7 'use_system_icu%': 0,
8 'icu_use_data_file_flag%': 0, 8 'icu_use_data_file_flag%': 0,
9 'want_separate_host_toolset%': 1, 9 'want_separate_host_toolset%': 1,
10 }, 10 },
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 ], 83 ],
84 }], 84 }],
85 [ 'icu_use_data_file_flag', { 85 [ 'icu_use_data_file_flag', {
86 # Remove any assembly data file. 86 # Remove any assembly data file.
87 'sources/': [['exclude', 'icudt46l_dat']], 87 'sources/': [['exclude', 'icudt46l_dat']],
88 # Compile in the stub data symbol. 88 # Compile in the stub data symbol.
89 'sources': ['source/stubdata/stubdata.c'], 89 'sources': ['source/stubdata/stubdata.c'],
90 90
91 # Make sure any binary depending on this gets the data file. 91 # Make sure any binary depending on this gets the data file.
92 'conditions': [ 92 'conditions': [
93 ['OS=="ios"', { 93 ['OS != "ios"', {
94 'mac_bundle_resources': [
95 'source/data/in/icudtl.dat',
96 ],
97 }, {
98 'copies': [{ 94 'copies': [{
99 'destination': '<(PRODUCT_DIR)', 95 'destination': '<(PRODUCT_DIR)',
100 'files': [ 96 'files': [
101 'source/data/in/icudtl.dat', 97 'source/data/in/icudtl.dat',
102 ], 98 ],
103 }], 99 }],
104 }], 100 } , { # else: OS=="ios"
105 ], # target_conditions 101 'link_settings': {
106 }], 102 'mac_bundle_resources': [
107 ], 103 'source/data/in/icudtl.dat',
104 ],
105 },
106 }], # OS!=ios
107 ], # conditions
108 }], # icu_use_data_file_flag
109 ], # conditions
108 'target_conditions': [ 110 'target_conditions': [
109 [ 'OS == "win" or OS == "mac" or OS == "ios" or ' 111 [ 'OS == "win" or OS == "mac" or OS == "ios" or '
110 '(OS == "android" and (_toolset == "target" or host_os != "linux") )', { 112 '(OS == "android" and (_toolset == "target" or host_os != "linux") )', {
111 'sources!': ['linux/icudt46l_dat.S'], 113 'sources!': ['linux/icudt46l_dat.S'],
112 }], 114 }],
113 [ 'OS != "android" or _toolset == "host"', { 115 [ 'OS != "android" or _toolset == "host"', {
114 'sources!': ['android/icudt46l_dat.S'], 116 'sources!': ['android/icudt46l_dat.S'],
115 }], 117 }],
116 [ 'OS != "mac" and OS != "ios" and ' 118 [ 'OS != "mac" and OS != "ios" and '
117 '(OS != "android" or _toolset != "host" or host_os != "mac")', { 119 '(OS != "android" or _toolset != "host" or host_os != "mac")', {
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 'toolsets': ['target'], 868 'toolsets': ['target'],
867 }, { 869 }, {
868 'toolsets': ['host', 'target'], 870 'toolsets': ['host', 'target'],
869 }], 871 }],
870 ], 872 ],
871 }, 873 },
872 ], 874 ],
873 }], 875 }],
874 ], 876 ],
875 } 877 }
OLDNEW
« 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