X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2FREADME;h=66d0bb0a25d0d9830add4ed7b3c953257d035dea;hp=1b86c45eb47d6416c8fc6284468749e55a19299d;hb=f805ea7aaabe202f1976a4edcdd2ea15bf59d678;hpb=a3f19f5513b3198180ef73c81eda93941ed9eb33;ds=sidebyside

diff --git a/cross-compile/android/README b/cross-compile/android/README
index 1b86c45..66d0bb0 100644
--- a/cross-compile/android/README
+++ b/cross-compile/android/README
@@ -16,18 +16,31 @@ Requirements
 ------------
 
  - bash
+ - gawk
  - gcc
  - make
  - git
  - pkg-config (>= 0.22)
- - Android NDK (tested: r10c)
+ - gettext
+ - ant
+ - Android NDK (tested: r10d)
    - Android cross-compile toolchain (tested: arm-linux-androideabi-4.9)
-     Create it via:
-     ./build/tools/make-standalone-toolchain.sh \
-	--platform=android-16 \
-	--toolchain=arm-linux-androideabi-4.9 \
-	--install-dir=$HOME/android/android-arm-toolchain
  - Android SDK (tested: r23.0.2)
+ - On 64bit hosts, you also need some i386 packages. E.g. on Debian/Ubuntu:
+     $ dpkg --add-architecture i386
+     $ apt-get update
+     $ apt-get install libstdc++6:i386 zlib1g:i386
+
+
+Toolchain setup
+---------------
+
+You can use the script to install and setup the Android NDK,
+SDK, and the respective standalone toolchain:
+
+ $ ./sigrok-cross-android prepare
+
+This will install everything into $HOME/android.
 
 
 Building