Index: icu.gyp |
=================================================================== |
--- icu.gyp (revision 213353) |
+++ icu.gyp (working copy) |
@@ -342,16 +342,20 @@ |
], |
}], |
['OS == "android" and use_system_stlport == 1', { |
- # 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', |
+ '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', |
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '-lgabi++', |
+ ], |
+ }, |
+ }], |
], |
- 'link_settings': { |
- 'libraries': [ |
- '-lgabi++', |
- ], |
- }, |
}], |
], |
}, |
@@ -566,16 +570,20 @@ |
}, |
}], |
['OS == "android" and use_system_stlport == 1', { |
- # 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', |
+ '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', |
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '-lgabi++', |
+ ], |
+ }, |
+ }], |
], |
- 'link_settings': { |
- 'libraries': [ |
- '-lgabi++', |
- ], |
- }, |
}], |
['clang==1', { |
'xcode_settings': { |