[Android] For shared library build, use shared versions of stlport and gnu_stl

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index e06636c6abfe4708bd43837c4d60380a22be261e..828b724d1f660cdb45bade66bf4ea1124a7f3351 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2704,6 +2704,9 @@
           }, {
             'android_stlport_library': 'stlport_static',
           }],
+          ['component=="shared_library" and use_system_stlport==0', {

[nilesh, 2012/11/06 18:37:04]

I think this should go as a condition in the rule above. That way it will not
depend on the order of these rules.

+            'android_stlport_library': 'stlport_shared',
+          }],
         ],
 
         # Placing this variable here prevents from forking libvpx, used
@@ -2796,6 +2799,11 @@
               '-lm',
             ],
             'conditions': [
+              ['component=="shared_library"', {
+                'libraries': [
+                  '-lgnustl_shared',
+                ],
+              }],
               ['android_upstream_bringup==1', {
                 'defines': ['ANDROID_UPSTREAM_BRINGUP=1',],
               }],
@@ -2908,16 +2916,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',
                     ],
                   }],
                 ],