From: Uwe Hermann <redacted>
Date: Tue, 28 Jul 2015 17:50:56 +0000 (+0200)
Subject: sigrok-cross-android: Fix "prepare" due to upstream changes.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f805ea7aaabe202f1976a4edcdd2ea15bf59d678;p=sigrok-util.git

sigrok-cross-android: Fix "prepare" due to upstream changes.

The "android update sdk" run now seems to need an additional "--all"
argument, otherwise various packages will not be found. It's unclear
whether this is an intentional upstream change or a bug (it used to
work fine without "--all" before).

Either way, adding "--all" has the desired effect.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index b8a17fa..4aee372 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -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
-  echo y | ./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 --all --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
   cd ..
 
   exit