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

[Libreoffice Gerrit user]

 android/README |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

New commits:
commit c1f5e5acce4015d93b491925ac1e1713b12120b5
Author:     Florin Ciornei <florin.ciornei at collabora.com>
AuthorDate: Tue Mar 19 16:00:38 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Mar 20 09:05:32 2019 +0100

    Updated some instructions in the android/README to make them more clear.
    
    Change-Id: I8dc5643bcde634dc66a3f75c6054cc093c18aad0
    Reviewed-on: https://gerrit.libreoffice.org/69427
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/README b/android/README
index b1580fdb3..02e54156e 100644
--- a/android/README
+++ b/android/README
@@ -1,6 +1,11 @@
-* Compile LibreOffice master for Android
+The development of this Android app has to be done on Linux, it's currently not possible to
+build the native parts on Windows.
 
-  Something like the following in autogen.input:
+* Compile LibreOffice master for Android.
+
+  Do this in the folder where you cloned the LibreOffice core (e.g master-android).
+
+  Create an autogen.input file:
 
       --build=x86_64-unknown-linux-gnu
       --with-android-ndk=/home/$USER/Android/Sdk/ndk-bundle
@@ -8,10 +13,14 @@
       --with-distro=LibreOfficeAndroid
       --enable-sal-log
 
-  And the usual ./autogen.sh && make
+  Run ./autogen.sh && make
 
 * Build the POCO for Android
 
+  # clone the poco repository in the same folder where LibreOffice core and online folders are placed.
+  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
 
@@ -24,11 +33,13 @@
   # 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
 
-* Configure the online.git
+* Configure the online.git (eg. in online-android folder)
+
+  Don't forget to change --with-lo-builddir in the following:
 
   ./autogen.sh && ./configure 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++ --host=arm-linux-androideabi --enable-androidapp --with-lo-builddir=/local/libreoffice/master-android --with-poco-includes=/opt/poco-android/include --with-poco-libs=/opt/poco-android/lib --disable-setcap --enable-silent-rules --enable-debug
 
-* Build the JavaScript, HTML and CSS files
+* Build the JavaScript, HTML and CSS files also in the online-android folder
 
   # just run 'make'
   make