diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-08-03 20:25:35 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:33:47 +0100 |
| commit | 69207d1f69ea258b95f456e494657dfdc7c22f13 (patch) | |
| tree | c73738c3c62cb478e539a38f7a5a7e7e0fd63db0 /sal | |
| parent | d10065ea3a45ef27f2d29ee75c3a51b1fd253431 (diff) | |
android: expose dummy JNI gnustl patching method for x86
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/android/lo-bootstrap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c index e7648798b520..8301af6d1a19 100644 --- a/sal/android/lo-bootstrap.c +++ b/sal/android/lo-bootstrap.c @@ -1408,9 +1408,9 @@ patch_libgnustl_shared(void) sizeof(expected_method_before_r7_code), &replacement_method_before_arm); } +#endif // not X86 // static native void patch_libgnustl_shared(); - __attribute__ ((visibility("default"))) void Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env, @@ -1419,11 +1419,11 @@ Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env, (void) env; (void) clazz; +#ifndef X86 patch_libgnustl_shared(); +#endif } -#endif // not X86 - #define UNPACK_TREE "/assets/unpack" static int |