diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-16 21:04:10 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-16 21:05:14 +0300 |
| commit | 8b5cf7fb57c0f68ee312d7f7b404533807349318 (patch) | |
| tree | 225332a33d0ae93aaf57dc0c2fcaa273012a49ab /sal | |
| parent | 2eb39893df0fa008da0f863caa65d8aea7eb107b (diff) | |
For kicks, enable cross-building for Android on MIPS
Change-Id: I6fa2b9a50c525fb2d8666a144409eb9a3ad2698a
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 8301af6d1a19..eace9b7f32a7 100644 --- a/sal/android/lo-bootstrap.c +++ b/sal/android/lo-bootstrap.c @@ -1235,7 +1235,7 @@ lo_dlcall_argc_argv(void *function, return result; } -#ifndef X86 +#ifdef ARM /* There is a bug in std::type_info::operator== and * std::type_info::before() in libgnustl_shared.so in NDK r7 at @@ -1408,7 +1408,7 @@ patch_libgnustl_shared(void) sizeof(expected_method_before_r7_code), &replacement_method_before_arm); } -#endif // not X86 +#endif // ARM // static native void patch_libgnustl_shared(); __attribute__ ((visibility("default"))) @@ -1419,7 +1419,7 @@ Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env, (void) env; (void) clazz; -#ifndef X86 +#ifdef ARM patch_libgnustl_shared(); #endif } |