sigrok-cross-android: Allow non-interactive "prepare".

When running "./sigrok-cross-android prepare" the installer will
ask for confirmation at the start, and for accepting license(s)
multiple times.

Allow non-interactive or scripted use by automating / forcing these
operations.

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index b9c4e2c8694995d4d27d5d2bba7c4f8f6517b8de..b8a17fae929adbe1b9807bb275b57851c75a27bf 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -103,7 +103,7 @@ if [ "x$1" = "xprepare" ]; then
   # NDK
   $WGET http://dl.google.com/android/ndk/android-ndk-r$VER_NDK-linux-x86.bin
   chmod 700 android-ndk-r$VER_NDK-linux-x86.bin
   # NDK
   $WGET http://dl.google.com/android/ndk/android-ndk-r$VER_NDK-linux-x86.bin
   chmod 700 android-ndk-r$VER_NDK-linux-x86.bin

-  ./android-ndk-r$VER_NDK-linux-x86.bin
+  ./android-ndk-r$VER_NDK-linux-x86.bin -y

   cd android-ndk-r$VER_NDK
   ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
     --toolchain=arm-linux-androideabi-4.9 \
   cd android-ndk-r$VER_NDK
   ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
     --toolchain=arm-linux-androideabi-4.9 \


@@ -120,7 +120,7 @@ if [ "x$1" = "xprepare" ]; then
   $WGET http://dl.google.com/android/android-sdk_r$VER_SDK-linux.tgz
   tar xfz android-sdk_r$VER_SDK-linux.tgz
   cd android-sdk-linux
   $WGET http://dl.google.com/android/android-sdk_r$VER_SDK-linux.tgz
   tar xfz android-sdk_r$VER_SDK-linux.tgz
   cd android-sdk-linux

-  ./tools/android update sdk --no-ui --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
+  echo y | ./tools/android update sdk --no-ui --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API

   cd ..
 
   exit
   cd ..
 
   exit