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

[Libreoffice Gerrit user]

 android/app/src/main/cpp/CMakeLists.txt.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f59e7a3740a94bb07107c0913dd2b25e3e6e5c58
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Apr 5 18:16:58 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Apr 5 18:16:58 2019 +0200

    android: Use the stripped liblo-native-code.so for the .apk.
    
    Change-Id: If0b5fd34d8a834a7297b4a92aaa782876345cfc4

diff --git a/android/app/src/main/cpp/CMakeLists.txt.in b/android/app/src/main/cpp/CMakeLists.txt.in
index 03b1ed7d9..cb1f31c8d 100644
--- a/android/app/src/main/cpp/CMakeLists.txt.in
+++ b/android/app/src/main/cpp/CMakeLists.txt.in
@@ -73,8 +73,8 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}/liblo-
                    COMMAND ${CMAKE_COMMAND} -E copy @LOBUILDDIR@/instdir/program/libssl3.so "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}"
                    DEPENDS @LOBUILDDIR@/instdir/program/libssl3.so
 
-                   COMMAND ${CMAKE_COMMAND} -E copy @LOBUILDDIR@/android/source/obj/local/armeabi-v7a/liblo-native-code.so "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}"
-                   DEPENDS @LOBUILDDIR@/android/source/obj/local/armeabi-v7a/liblo-native-code.so
+                   COMMAND ${CMAKE_COMMAND} -E copy @LOBUILDDIR@/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}"
+                   DEPENDS @LOBUILDDIR@/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so
 
                    COMMENT "Copied liblo-native-code.so and its dependencies to the tree."
 )