android/README | 13 ++++++++----- android/lib/src/main/cpp/CMakeLists.txt.in | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-)
New commits: commit f8820d2024a947a66b7f95c1c3675c624a7427ff Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Jun 29 15:35:07 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Jul 2 10:11:12 2020 +0200 android: The location of liblo-native-code.so has changed. Don't try to look it up at the old location, that'll only cause problems. Change-Id: I6376770ce09c5a19cfe1514e1fd12c508a5fc3d0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97420 Tested-by: Jan Holesovsky <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97713 Tested-by: Andras Timar <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in index 02e2bbb3f..c0b08d1fa 100644 --- a/android/lib/src/main/cpp/CMakeLists.txt.in +++ b/android/lib/src/main/cpp/CMakeLists.txt.in @@ -42,6 +42,8 @@ else() MESSAGE(FATAL_ERROR "Cannot build for ABI ${ANDROID_ABI}, please add support for that.") endif() +set(LIBLO_NATIVE_CODE ${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so) + target_include_directories(androidapp PRIVATE . # path to androidapp.h ../../../../.. # path to config.h @@ -92,8 +94,8 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}/liblo- COMMAND ${CMAKE_COMMAND} -E copy ${LOBUILDDIR_ABI}/instdir/program/libssl3.so "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}" DEPENDS ${LOBUILDDIR_ABI}/instdir/program/libssl3.so - COMMAND ${CMAKE_COMMAND} -E copy ${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}" - DEPENDS ${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so + COMMAND ${CMAKE_COMMAND} -E copy ${LIBLO_NATIVE_CODE} "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}" + DEPENDS ${LIBLO_NATIVE_CODE} COMMENT "Copied liblo-native-code.so and its dependencies to the tree." ) commit 394cadd0a0c218c81d26423a819e0c86f33bbaaf Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Jun 29 15:16:35 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Jul 2 10:10:58 2020 +0200 android: Update POCO instructions to 1.10.1. Change-Id: Iff8c7145e0372086bfa6a4c4f47e8d964244abc0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97419 Tested-by: Jenkins Tested-by: Jan Holesovsky <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97712 Tested-by: Andras Timar <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/android/README b/android/README index 7b525e357..7223e121e 100644 --- a/android/README +++ b/android/README @@ -21,11 +21,11 @@ build the native parts on Windows. git clone https://github.com/pocoproject/poco poco-android cd poco-android - # use the 1.9.1 branch - git checkout -b poco-1.9.1 origin/poco-1.9.1 + # use the 1.10.1 branch + git checkout -b poco-1.10.1 origin/poco-1.10.1 # configure - ./configure --config=Android --no-samples --no-tests --minimal + ./configure --config=Android --no-samples --no-tests --omit=Crypto,NetSSL_OpenSSL,Zip,Data,Data/SQLite,Data/ODBC,Data/MySQL,MongoDB,PDF,CppParser,PageCompiler,JWT # make it PATH="$PATH":~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin make -j8 ANDROID_ABI=armeabi-v7a CC=armv7a-linux-androideabi21-clang CXX=armv7a-linux-androideabi21-clang++ SYSLIBS=-static-libstdc++ @@ -35,7 +35,7 @@ build the native parts on Windows. * 64bit POCO for Android - # checkout the 1.9.1 in a different location and apply the following patch: + # checkout the 1.10.1 in a different location and apply the following patch: --- a/build/config/Android +++ b/build/config/Android @@ -21,6 +21,11 @@ TOOL = arm-linux-androideabi @@ -59,7 +59,10 @@ build the native parts on Windows. # # Define Tools - # configure as above and make it: + # configure as above: + ./configure --config=Android --no-samples --no-tests --omit=Crypto,NetSSL_OpenSSL,Zip,Data,Data/SQLite,Data/ODBC,Data/MySQL,MongoDB,PDF,CppParser,PageCompiler,JWT + + # and make it: PATH="$PATH":~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin make -j8 ANDROID_ABI=arm64-v8a CC=aarch64-linux-android21-clang CXX=aarch64-linux-android21-clang++ SYSLIBS=-static-libstdc++ # install _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
