android/README | 32 ++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit 888a9e56ab645476471b65b351ea909c830741cd
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Sat Nov 9 00:29:18 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Sat Nov 9 00:33:25 2019 +0100
android: Back to using POCO.
It turns out that the std::filesystem is still not part of the NDK:
https://github.com/android/ndk/issues/609
The NDK has the header - but not the c++fs library yet :-(
Change-Id: Ic7003f71cd4730b2f34138adea3b09fe92fdbb4a
Reviewed-on: https://gerrit.libreoffice.org/82336
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/android/README b/android/README
index 3ed9f01c2..eb34c511b 100644
--- a/android/README
+++ b/android/README
@@ -33,6 +33,38 @@ build the native parts on Windows.
# install it to /opt/poco-android
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++ install
INSTALLDIR=/opt/poco-android
+* 64bit POCO for Android
+
+ # checkout the 1.9.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
+ ARCHFLAGS = -march=armv7-a -mfloat-abi=softfp
+ LINKFLAGS = -Wl,--fix-cortex-a8
+ else
+ +ifeq ($(ANDROID_ABI),arm64-v8a)
+ +TOOL = aarch64-linux-android
+ +#ARCHFLAGS = -march=armv7-a -mfloat-abi=softfp
+ +#LINKFLAGS = -Wl,--fix-cortex-a8
+ +else
+ ifeq ($(ANDROID_ABI),x86)
+ TOOL = i686-linux-android
+ ARCHFLAGS = -march=i686 -msse3 -mstackrealign -mfpmath=sse
+ @@ -29,6 +34,7 @@ $(error Invalid ABI specified in ANDROID_ABI)
+ endif
+ endif
+ endif
+ +endif
+
+ #
+ # Define Tools
+
+ # configure as above 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
+
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
+
* Configure the online.git (eg. in online-android folder)
Don't forget to change --with-lo-builddir in the following:
diff --git a/configure.ac b/configure.ac
index 401738c67..5d1a63689 100644
--- a/configure.ac
+++ b/configure.ac
@@ -533,7 +533,7 @@ else
fi
STD_FILESYSTEM=
-if test "$CXXFLAGS_CXX11" = "-std=c++17" ; then
+if test "$CXXFLAGS_CXX11" = "-std=c++17" -a "$ENABLE_ANDROIDAPP" != "true" ;
then
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS -Werror"
save_LIBS=$LIBS
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
