android: x86 porting work.

1 files changed, 17 insertions, 13 deletions

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 677ff1c8ba7a..e7648798b520 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1235,6 +1235,8 @@ lo_dlcall_argc_argv(void *function,
     return result;
 }
 
+#ifndef X86
+
 /* There is a bug in std::type_info::operator== and
  * std::type_info::before() in libgnustl_shared.so in NDK r7 at
  * least. They compare the type name pointers instead of comparing the
@@ -1407,6 +1409,21 @@ patch_libgnustl_shared(void)
           &replacement_method_before_arm);
 }
 
+// static native void patch_libgnustl_shared();
+
+__attribute__ ((visibility("default")))
+void
+Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env,
+                                                                jobject clazz)
+{
+    (void) env;
+    (void) clazz;
+
+    patch_libgnustl_shared();
+}
+
+#endif // not X86
+
 #define UNPACK_TREE "/assets/unpack"
 
 static int
@@ -1520,19 +1537,6 @@ extract_files(const char *prefix)
     lo_apk_closedir(tree);
 }
 
-// static native void patch_libgnustl_shared();
-
-__attribute__ ((visibility("default")))
-void
-Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env,
-                                                                jobject clazz)
-{
-    (void) env;
-    (void) clazz;
-
-    patch_libgnustl_shared();
-}
-
 // static native void extract_files();
 
 __attribute__ ((visibility("default")))