summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/Bootstrap/version.map1
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/except.cxx3
2 files changed, 1 insertions, 3 deletions
diff --git a/android/Bootstrap/version.map b/android/Bootstrap/version.map
index e12d9985e78f..067785410a7a 100644
--- a/android/Bootstrap/version.map
+++ b/android/Bootstrap/version.map
@@ -2,6 +2,7 @@ dummy {
global:
Java_*;
JNI_OnLoad;
+ _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
local:
*;
};
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index b4a5117b81c0..46c7f9c85a7f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -148,9 +148,6 @@ namespace CPPU_CURRENT_NAMESPACE
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
#else
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
- // Unfortunately dlsym for weak symbols doesn't work in
- // Android 4.0 at least, sigh, so we will always take the
- // else branch below.
#endif
if (rtti)