summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-02-21 22:37:47 +0200
committerTor Lillqvist <tml@collabora.com>2014-02-21 22:38:03 +0200
commit2462aa668f7109fc40de9fbf5e13e1f3fdf904cd (patch)
treef03ea167cc1beb3775feddfb27a609e39415bfd0
parentfix mac build, c++11isms (diff)
downloadcore-2462aa668f7109fc40de9fbf5e13e1f3fdf904cd.tar.gz
core-2462aa668f7109fc40de9fbf5e13e1f3fdf904cd.zip
Minor updates
Change-Id: I8f3580f10e8beee4103780be71a08929e9000bf0
-rw-r--r--README.Android4
-rw-r--r--README.cross8
2 files changed, 6 insertions, 6 deletions
diff --git a/README.Android b/README.Android
index 3a78e76462af..68bec2456368 100644
--- a/README.Android
+++ b/README.Android
@@ -1,7 +1,9 @@
Android-specific notes
Note that this document has not necessarily been updated to match
-reality...
+reality...
+
+For instructions on how to build for Android, see README.cross.
* Getting something running on an emulated device
diff --git a/README.cross b/README.cross
index 49fe05e4c61d..74917faefbea 100644
--- a/README.cross
+++ b/README.cross
@@ -345,12 +345,12 @@ from Linux:
--enable-dbgutil
--enable-debug
--enable-werror
---with-android-ndk=/home/tml/android-ndk-r8d
---with-android-ndk-toolchain-version=4.6
+--with-android-ndk=/home/tml/android-ndk-r9c
+--with-android-ndk-toolchain-version=4.8
--with-android-sdk=/home/tml/adt-bundle-linux/sdk
--with-distro=LibreOfficeAndroid
-And here is an autogen.input for Android on X86:
+And here is an (quite old) autogen.input for Android on X86:
--with-android-ndk=/opt/libreoffice/android-ndk-r8b
--with-android-ndk-toolchain-version=4.6
@@ -358,8 +358,6 @@ And here is an autogen.input for Android on X86:
--build=i586-suse-linux
--enable-ccache
--with-distro=LibreOfficeAndroidX86
---with-num-cpus=6
---with-max-jobs=6
There are a couple of (more or less) interactive apps that you can run
on the emulator or on a device that use LibreOffice code. Look in