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

Unified Diff: build/common.gypi

Issue 11312056: [Android] For shared library build, use shared versions of stlport and gnu_stl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 319e866561961edfb79bcfc31b555486590d5a25..5624724e0cc33f4c0d7de5a75851677f77e9d13a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2785,7 +2785,13 @@
['use_system_stlport==1', {
'android_stlport_library': 'stlport',
}, {
- 'android_stlport_library': 'stlport_static',
+ 'conditions': [
+ ['component=="shared_library"', {
+ 'android_stlport_library': 'stlport_shared',
+ }, {
+ 'android_stlport_library': 'stlport_static',
+ }],
+ ],
}],
],
@@ -2879,6 +2885,11 @@
'-lm',
],
'conditions': [
+ ['component=="shared_library"', {
+ 'libraries': [
+ '-lgnustl_shared',
digit1 2012/11/20 20:33:19 sorry, didn't catch that earlier, but it's probabl
Yaron 2012/11/21 02:58:30 Probably true but since this is just in bring-up p
+ ],
+ }],
['android_upstream_bringup==1', {
'defines': ['ANDROID_UPSTREAM_BRINGUP=1',],
}],
@@ -3000,16 +3011,19 @@
['target_arch=="arm" and armv7==1', {
'ldflags': [
'-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeabi-v7a',
+ '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a',
],
}],
['target_arch=="arm" and armv7==0', {
'ldflags': [
'-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeabi',
+ '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi',
],
}],
['target_arch=="ia32"', {
'ldflags': [
'-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/x86',
+ '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/libs/x86',
],
}],
],
« 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