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

Unified Diff: icu.gyp

Issue 21031003: Fix building icu for android on mac host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu46/
Patch Set: Created 7 years, 5 months 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 214181)
+++ icu.gyp (working copy)
@@ -82,15 +82,6 @@
},
],
}],
- [ 'OS == "win" or OS == "mac" or OS == "ios" or OS == "android"', {
- 'sources!': ['linux/icudt46l_dat.S'],
- }],
- [ 'OS != "android"', {
- 'sources!': ['android/icudt46l_dat.S'],
- }],
- [ 'OS != "mac" and OS != "ios"', {
- 'sources!': ['mac/icudt46l_dat.S'],
- }],
[ 'OS != "win" and icu_use_data_file_flag', {
# Remove any assembly data file.
'sources/': [['exclude', 'icudt46l_dat']],
@@ -115,6 +106,19 @@
}, # link_settings
}],
],
+ 'target_conditions': [
+ [ 'OS == "win" or OS == "mac" or OS == "ios" or '
+ '(OS == "android" and (_toolset == "target" or host_os != "linux"))', {
+ 'sources!': ['linux/icudt46l_dat.S'],
+ }],
+ [ 'OS != "android" or _toolset == "host"', {
+ 'sources!': ['android/icudt46l_dat.S'],
+ }],
+ [ 'OS != "mac" and OS != "ios" and '
+ '(OS != "android" or _toolset != "host" or host_os != "mac")', {
+ 'sources!': ['mac/icudt46l_dat.S'],
+ }],
+ ],
},
{
'target_name': 'icui18n',
« 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