From 758fd36b91ad14fd31fe99f82245a703902c724b Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Sun, 1 Mar 2015 17:49:25 +0300 Subject: [PATCH] Removed old fix for 2.1 devices. --- .../jni/com/mapswithme/core/jni_helper.cpp | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/android/jni/com/mapswithme/core/jni_helper.cpp b/android/jni/com/mapswithme/core/jni_helper.cpp index 6bc77d2434..2d9612fe23 100644 --- a/android/jni/com/mapswithme/core/jni_helper.cpp +++ b/android/jni/com/mapswithme/core/jni_helper.cpp @@ -16,36 +16,9 @@ void InitNVEvent(JavaVM * jvm); extern "C" { -/// fix for stack unwinding problem during exception handling on Android 2.1 -/// http://code.google.com/p/android/issues/detail?id=20176 -#ifdef __arm__ - - typedef long unsigned int *_Unwind_Ptr; - - /* Stubbed out in libdl and defined in the dynamic linker. - * Same semantics as __gnu_Unwind_Find_exidx(). - */ - _Unwind_Ptr dl_unwind_find_exidx(_Unwind_Ptr pc, int *pcount); - _Unwind_Ptr __gnu_Unwind_Find_exidx(_Unwind_Ptr pc, int *pcount) - { - return dl_unwind_find_exidx(pc, pcount); - } - - static void* g_func_ptr; - -#endif // __arm__ - JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * jvm, void *) { -/// fix for stack unwinding problem during exception handling on Android 2.1 -/// http://code.google.com/p/android/issues/detail?id=20176 -#ifdef __arm__ - // when i throw exception, linker maybe can't find __gnu_Unwind_Find_exidx(lazy binding issue??) - // so I force to bind this symbol at shared object load time - g_func_ptr = (void*)__gnu_Unwind_Find_exidx; -#endif // __arm__ - g_jvm = jvm; jni::InitSystemLog(); jni::InitAssertLog();