From: Uwe Hermann <redacted>
Date: Mon, 25 Aug 2014 20:50:26 +0000 (+0200)
Subject: sigrok-cross-android: Assume ANDROID_{NDK,SDK} to live in $HOME.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b7f669dde289962a0b48aaba3cd70f6aec02f34c;p=sigrok-util.git

sigrok-cross-android: Assume ANDROID_{NDK,SDK} to live in $HOME.

This is consistent with the rest of the paths (and allows working as
non-root user).
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 89359d3..9f0a127 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -22,10 +22,10 @@
 set -e
 
 # The path where Android NDK is located.
-ANDROID_NDK=/usr/local/android-ndk-r9d
+ANDROID_NDK=$HOME/android/android-ndk-r9d
 
 # The path where Android SDK is located.
-ANDROID_SDK=/usr/local/android
+ANDROID_SDK=$HOME/android/android-sdk-linux
 
 # The path where your Android toolchain directory is located.
 TOOLCHAIN=$HOME/android/android-arm-toolchain