diff options
| author | michaelbai@google.com <michaelbai@google.com@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2011-10-31 18:03:49 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2011-10-31 18:03:49 +0000 |
| commit | 3825a2325c823720fe822e8bdd079180cdb9735e (patch) | |
| tree | f61c176d06a09b4c9e66260b2f063f722d581f83 /icu.gyp | |
| parent | b689cbb4cf7261f75148d8f88ff6c5a5af9fbe79 (diff) | |
| download | icu-3825a2325c823720fe822e8bdd079180cdb9735e.tar.gz | |
Upstream: Android's ICU change
BUG=
TEST=
Review URL: http://codereview.chromium.org/8403006
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu46@107982 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'icu.gyp')
| -rw-r--r-- | icu.gyp | 56 |
1 files changed, 56 insertions, 0 deletions
@@ -292,6 +292,34 @@ }, } }], + ['OS == "android"', { + 'include_dirs': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/include', + ], + 'conditions': [ + ['target_arch=="arm" and armv7==1', { + 'link_settings': { + 'libraries': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a', + ] + }, + }], + ['target_arch=="arm" and armv7==0', { + 'link_settings': { + 'libraries': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a', + ] + }, + }], + ['target_arch=="ia32"', { + 'link_settings': { + 'libraries': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a', + ] + }, + }], + ], + }], ], }, { @@ -505,6 +533,34 @@ }, } }], + ['OS == "android"', { + 'include_dirs': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/include', + ], + 'conditions': [ + ['target_arch=="arm" and armv7==1', { + 'link_settings': { + 'libraries': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a', + ] + }, + }], + ['target_arch=="arm" and armv7==0', { + 'link_settings': { + 'libraries': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a', + ] + }, + }], + ['target_arch=="ia32"', { + 'link_settings': { + 'libraries': [ + '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a', + ] + }, + }], + ], + }], ], }, ], |