| 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)',
|
|
|