[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - cppuhelper/source

[Jan Holesovsky (via logerrit)]

 cppuhelper/source/exc_thrower.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 8db9ba7e87a1d706aa27b14de7f1fd11ea252b62
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Dec 2 11:32:45 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Jan 28 10:10:11 2020 +0100

    android: Actually let's avoid the exceptions via bridges only on aarch4.
    
    Change-Id: Id2830f09ca6afd11f6f866565f37bdb7ba45bfb1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84206
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 703f74be7a5d..a0c84e70a74b 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -173,7 +173,7 @@ ExceptionThrower::ExceptionThrower()
 
 class theExceptionThrower : public rtl::Static<ExceptionThrower, theExceptionThrower> {};
 
-#if defined(IOS) || HAVE_FEATURE_ANDROID_LOK
+#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
 // In the native iOS / Android app, where we don't have any Java, Python,
 // BASIC, or other scripting, the only thing that would use the C++/UNO bridge
 // functionality that invokes codeSnippet() was cppu::throwException().
@@ -211,7 +211,7 @@ void lo_mobile_throwException(css::uno::Any const& aException)
 
     assert(false);
 }
-#endif // defined(IOS) || HAVE_FEATURE_ANDROID_LOK
+#endif // defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
 
 } // anonymous namespace
 
@@ -229,7 +229,7 @@ void SAL_CALL throwException( Any const & exc )
             "(must be derived from com::sun::star::uno::Exception)!" );
     }
 
-#if defined(IOS) || HAVE_FEATURE_ANDROID_LOK
+#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
     lo_mobile_throwException(exc);
 #else
     Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent());
@@ -252,7 +252,9 @@ void SAL_CALL throwException( Any const & exc )
 
 Any SAL_CALL getCaughtException()
 {
-#if HAVE_FEATURE_ANDROID_LOK
+#if defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK
+    // FIXME This stuff works on 32bit ARM, let's use the shortcut only for
+    // the 64bit ARM.
     return Any();
 #else
     Mapping cpp2uno(Environment::getCurrent(), Environment(UNO_LB_UNO));