From 37b3acbdf12364620e42bf41d0f1f4db2bebf967 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 1 Jul 2020 11:10:01 +0200 Subject: android: Add support for x86 ABI too. Turns out that the ChromeOS uses the x86 Android runtime, not x86-64. Change-Id: Ic3b6f7a65d35d2298daa731f46e57068eaf2583d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97607 Tested-by: Jenkins Reviewed-by: Jan Holesovsky --- android/README | 16 ++++++++++++++++ android/lib/src/main/cpp/CMakeLists.txt.in | 4 ++++ 2 files changed, 20 insertions(+) (limited to 'android') diff --git a/android/README b/android/README index 7223e121e9..5cffa4b4f5 100644 --- a/android/README +++ b/android/README @@ -68,6 +68,22 @@ build the native parts on Windows. # install 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 INSTALLDIR=/opt/poco-android-64bit +* Poco for x86 (if you want to add the support for that into the APK too): + + # checkout the 1.10.1 in yet another location + git clone https://github.com/pocoproject/poco poco-android-x86 + cd poco-android-x86 + git checkout -b poco-1.10.1 origin/poco-1.10.1 + + # configure + ./configure --config=Android --no-samples --no-tests --omit=Crypto,NetSSL_OpenSSL,Zip,Data,Data/SQLite,Data/ODBC,Data/MySQL,MongoDB,PDF,CppParser,PageCompiler,JWT + + # build + PATH="$PATH":~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin make -j8 ANDROID_ABI=x86 CC=i686-linux-android21-clang CXX=i686-linux-android21-clang++ SYSLIBS=-static-libstdc++ + + # install + PATH="$PATH":~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin make -j8 ANDROID_ABI=x86 CC=i686-linux-android21-clang CXX=i686-linux-android21-clang++ SYSLIBS=-static-libstdc++ install INSTALLDIR=/opt/poco-android-x86 + * Poco for x86_64 (if you want to add the support for that into the APK too): # checkout the 1.10.1 in yet another location diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in index 53a3fafd79..2e1a5fdb81 100644 --- a/android/lib/src/main/cpp/CMakeLists.txt.in +++ b/android/lib/src/main/cpp/CMakeLists.txt.in @@ -37,6 +37,10 @@ elseif(${ANDROID_ABI} STREQUAL "arm64-v8a") set(LOBUILDDIR_ABI @LOBUILDDIR_ARM64_V8A@) set(POCOINCLUDE_ABI @POCOINCLUDE_ARM64_V8A@) set(POCOLIB_ABI @POCOLIB_ARM64_V8A@) +elseif(${ANDROID_ABI} STREQUAL "x86") + set(LOBUILDDIR_ABI @LOBUILDDIR_X86@) + set(POCOINCLUDE_ABI @POCOINCLUDE_X86@) + set(POCOLIB_ABI @POCOLIB_X86@) elseif(${ANDROID_ABI} STREQUAL "x86_64") set(LOBUILDDIR_ABI @LOBUILDDIR_X86_64@) set(POCOINCLUDE_ABI @POCOINCLUDE_X86_64@) -- cgit