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

[Libreoffice Gerrit user]

 android/README                          |    8 ++++----
 android/app/src/main/cpp/CMakeLists.txt |    5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit b5c50021c7b16ef24b4e739a680aa0f3be1e8531
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Feb 12 13:24:52 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Feb 12 13:24:52 2019 +0100

    android: POCO 1.9.1 is fine too - simplify the build instructions.

diff --git a/android/README b/android/README
index d43ac6cb0..1183e77dc 100644
--- a/android/README
+++ b/android/README
@@ -12,17 +12,17 @@
 
 * Build the POCO for Android
 
-  # use the 1.9.0 branch; the 1.9.1 and master did not compile for me
-  git checkout -b poco-1.9.0 origin/poco-1.9.0
+  # use the 1.9.1 branch
+  git checkout -b poco-1.9.1 origin/poco-1.9.1
 
   # configure
   ./configure --config=Android --no-samples --no-tests --minimal
 
   # make it
-  make ANDROID_ABI=armeabi-v7a TOOL=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++
+  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 it to /opt/poco-android
-  make ANDROID_ABI=armeabi-v7a TOOL=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ install INSTALLDIR=/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
 
 * Configure the online.git
 
commit 4771ad0c4abd2c2825681b3d76812a971a4736e8
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Feb 12 13:24:04 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Feb 12 13:24:04 2019 +0100

    android: The order of static libraries is important.
    
    Otherwise some symbols are optimized out, but needed by a later library.

diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
index 6c78b4f08..652575c8d 100644
--- a/android/app/src/main/cpp/CMakeLists.txt
+++ b/android/app/src/main/cpp/CMakeLists.txt
@@ -40,11 +40,10 @@ target_link_libraries(androidapp
                       log
                       /local/libreoffice/master-android/workdir/LinkTarget/StaticLibrary/liblibpng.a
                       /opt/poco-android/lib/libPocoEncodings.a
-                      /opt/poco-android/lib/libPocoFoundation.a
-                      /opt/poco-android/lib/libPocoJSON.a
                       /opt/poco-android/lib/libPocoNet.a
                       /opt/poco-android/lib/libPocoRedis.a
                       /opt/poco-android/lib/libPocoUtil.a
                       /opt/poco-android/lib/libPocoXML.a
-                      -static-libstdc++
+                      /opt/poco-android/lib/libPocoJSON.a
+                      /opt/poco-android/lib/libPocoFoundation.a
                       )