scripts

commit a99bb2ef518854a6f7dd628d75bc1eb26b610c9c
parent b71eb3a4be617bc75cf519aff3df21da920e7fc0
Author: clamiax <smoppy@gmail.com>
Date:   Thu, 29 Oct 2015 14:27:12 +0100

[droid] local.properties have higher priority on ANDROID_HOME.

Diffstat:
M
src/droid
 | 
3
+--

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/droid b/src/droid
@@ -9,8 +9,7 @@ SDK_URL=http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz
 GRADLE_URL=https://services.gradle.org/distributions/gradle-2.3-bin.zip
 
 # Remove the need to have sdk.dir in local.properties
-# XXX If local.properties exists, it should have higher priority
-export ANDROID_HOME="$SDKDIR"
+[ ! -f "local.properties" ] && export ANDROID_HOME="$SDKDIR"
 
 _adb() {
 	# XXX if adb is not running as root, it must be started first