Android: improve build instructions

* Add unpack commands for Linux.
* Specify that API level 11 is required to build.
* Describe how to get the thirdparty package using git submodule.

1 files changed, 20 insertions, 5 deletions

diff --git a/android/ReadMe.txt b/android/ReadMe.txt
index 78832e8c..fc885d83 100644
--- a/android/ReadMe.txt
+++ b/android/ReadMe.txt
@@ -10,6 +10,12 @@ on Macos an older version installed as:
 
    /Library/android-sdk-mac_x86
 
+on Linux install it as:
+
+   mkdir ~/android-sdk
+   cd ~/android-sdk
+   tar ~/Downloads/android-sdk_r20.0.3-linux.tgz
+
 Whatever directory it unpacks to, ensure that both the 'tools' and
 'platform-tools' directories inside it have been added to your PATH.
 
@@ -24,6 +30,12 @@ on Macos an older version unpacked as:
 
    /Library/android-ndk-r5
 
+on Linux as:
+
+   mkdir ~/android-ndk
+   cd ~/android-ndk
+   tar jxvf ~/Downloads/android-ndk-r8b-linux-x86.tar.bz2
+
 It is very important that you should unpack it to a directory with no
 spaces in the name! (Don't be tempted to put it in C:\Program Files etc)
 
@@ -44,7 +56,8 @@ you need to install Cygwin 1.7 or greater now.
 'android' (or android.bat on cygwin/windows). You should now have a window
 with a graphical gui for the sdk. From here you can install the different SDK
 components for the different flavours of android. Download them all -
-bandwidth and disk space are cheap, right?
+bandwidth and disk space are cheap, right? Make sure you get at least
+the API level 11 as this is the current dependency for mupdf.
 
 5) In new versions of the GUI there is a 'Tools' menu from which you can
 select 'Manage AVDs...'. In old versions, go to the Virtual Devices entry
@@ -74,10 +87,12 @@ the top level directory, and that ANT_HOME/bin is on the PATH.
 8) Now we are ready to build mupdf for Android. Check out a copy of MuPDF
 (but you've done that already, cos you're reading this, right?).
 
-9) You will also need a copy of mupdf-thirdparty.zip (see the source code
-link on http://mupdf.com/). Unpack the contents of this into a 'thirdparty'
-directory created within the mupdf directory (i.e. at the same level as
-fitz, pdf, android etc).
+9) You will also need a copy of mupdf's thirdparty libraries. If you are
+using git, make sure to do a git submodule update --init from the top of
+the build tree. Older versions packaged this source code in a .zip-file
+(see the source code link on http://mupdf.com/). Unpack the contents of
+this into a 'thirdparty' directory created within the mupdf directory
+(i.e. at the same level as fitz, pdf, android etc).
 
 10) Finally, you will need a copy of a 'generated' directory. This is not
 currently available to download.