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

Unified Diff: icu.gyp

Issue 690603002: Remove Android system ICU support. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/icu52
Patch Set: Created 6 years, 2 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
diff --git a/icu.gyp b/icu.gyp
index 21aa82d50400d53b83e000c0315f947aa16e16b4..94ab910ed13e4e32eb6dc0578d03db25f1d3242e 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -247,17 +247,6 @@
},
},
}],
- ['OS == "android" and use_system_stlport == 1', {
- 'target_conditions': [
- ['_toolset == "target"', {
- # ICU requires RTTI, which is not present in the system's
- # stlport, so we have to include gabi++.
- 'include_dirs': [
- '<(android_src)/abi/cpp/include',
- ],
- }],
- ],
- }],
], # conditions
},
{
@@ -354,17 +343,6 @@
},
},
}],
- ['OS == "android" and use_system_stlport == 1', {
- 'target_conditions': [
- ['_toolset == "target"', {
- # ICU requires RTTI, which is not present in the system's
- # stlport, so we have to include gabi++.
- 'include_dirs': [
- '<(android_src)/abi/cpp/include',
- ],
- }],
- ],
- }],
], # conditions
},
], # targets
@@ -375,20 +353,6 @@
'target_name': 'system_icu',
'type': 'none',
'conditions': [
- ['OS=="android"', {
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(android_src)/external/icu/icu4c/source/common',
- '<(android_src)/external/icu/icu4c/source/i18n',
- ],
- },
- 'link_settings': {
- 'libraries': [
- '-licui18n',
- '-licuuc',
- ],
- },
- }],
['OS=="qnx"', {
'link_settings': {
'libraries': [
@@ -397,7 +361,7 @@
],
},
}],
- ['OS!="android" and OS!="qnx"', {
+ ['OS!="qnx"', {
'link_settings': {
'ldflags': [
'<!@(icu-config --ldflags)',
« 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