Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 95ce2db74bd0ea0fbc3abcf524fa3221fbd50879..562c57879e886afb10d760076877a58bbe379e77 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1183,7 +1183,6 @@ |
'android_sdk_root%': '<(android_sdk_root)', |
'android_sdk_version%': '<(android_sdk_version)', |
'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport', |
- 'android_libstdcpp_root': '<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6', |
'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)', |
@@ -1233,11 +1232,8 @@ |
'android_sdk_jar%': '<(android_sdk)/android.jar', |
'android_stlport_root': '<(android_stlport_root)', |
- 'android_libstdcpp_root': '<(android_libstdcpp_root)', |
'android_stlport_include': '<(android_stlport_root)/stlport', |
- 'android_libstdcpp_include': '<(android_libstdcpp_root)/include', |
'android_stlport_libs_dir': '<(android_stlport_root)/libs/<(android_app_abi)', |
- 'android_libstdcpp_libs_dir': '<(android_libstdcpp_root)/libs/<(android_app_abi)', |
# Location of the "strip" binary, used by both gyp and scripts. |
'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)', |
@@ -3410,9 +3406,6 @@ |
], |
'conditions': [ |
['component=="shared_library"', { |
- 'libraries': [ |
- '-lgnustl_shared', |
- ], |
'ldflags!': [ |
'-Wl,--exclude-libs=ALL', |
], |
@@ -3531,11 +3524,9 @@ |
}, { # else: use_system_stlport!=1 |
'cflags': [ |
'-I<(android_stlport_include)', |
- '-I<(android_libstdcpp_include)', |
], |
'ldflags': [ |
'-L<(android_stlport_libs_dir)', |
- '-L<(android_libstdcpp_libs_dir)', |
], |
}], |
['target_arch=="ia32"', { |