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

Unified Diff: icu.gyp

Issue 10632003: Implement use_system_icu for Android. (Closed) Base URL: http://git.chromium.org/chromium/deps/icu46.git@master
Patch Set: Created 8 years, 6 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 4a5bddcb5a2f302b66cd0e777b7ff116383f7fda..c3b6197f4ceb05a8bab5775ad564eb6698cd8408 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -571,14 +571,31 @@
'USE_SYSTEM_ICU',
],
},
- 'link_settings': {
- 'ldflags': [
- '<!@(icu-config --ldflags)',
- ],
- 'libraries': [
- '<!@(icu-config --ldflags-libsonly)',
- ],
- },
+ 'conditions': [
+ ['OS=="android"', {
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(android_src)/external/icu4c/common',
+ '<(android_src)/external/icu4c/i18n',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-licui18n',
+ '-licuuc',
+ ],
+ },
+ },{ # OS!="android"
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(icu-config --ldflags)',
+ ],
+ 'libraries': [
+ '<!@(icu-config --ldflags-libsonly)',
+ ],
+ },
+ }],
+ ],
},
{
'target_name': 'icudata',
« 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