[Libreoffice-commits] online.git: android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/build.gradle |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 473e52d27bcca36a0ec46d558406c19cfef7a4c5
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Oct 25 13:45:10 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Oct 25 14:31:26 2019 +0200

    android: Fix a linking problem.
    
    This is needed after core.git's
    f68a36b62ed327eb67efdfea0ac46645b4d90877, without it the native code
    crashes:
    
    E/AndroidRuntime: FATAL EXCEPTION: main
    
        Process: com.collabora.libreoffice.debug, PID: 25358
        java.lang.UnsatisfiedLinkError: dlopen failed: library "libc++_shared.so" not found
            at java.lang.Runtime.loadLibrary0(Runtime.java:1071)
            at java.lang.Runtime.loadLibrary0(Runtime.java:1007)
            at java.lang.System.loadLibrary(System.java:1667)
            at org.libreoffice.androidlib.LOActivity.<clinit>(LOActivity.java:467)
            at java.lang.Class.newInstance(Native Method)
            at android.app.AppComponentFactory.instantiateActivity(AppComponentFactory.java:95)
            ...
    
    Change-Id: If0d0f3ade3d2a5a8692dcc3d79edbfb51cd7e2ed
    Reviewed-on: https://gerrit.libreoffice.org/81499
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index f208d302b..0120a2416 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -11,6 +11,11 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_ARM_NEON=TRUE", "-DANDROID_STL=c++_shared"
+            }
+        }
     }
 
     buildTypes {