From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 2 Jul 2014 13:01:08 +0000 (+0200)
Subject: Don't set $SDK, it's too ambiguous with e.g. the Java SDK
X-Git-Tag: 0.2.1~67
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c64aafaf42f3f94a3502ae5c6dc9e533bbd8445e;p=fdroidserver.git

Don't set $SDK, it's too ambiguous with e.g. the Java SDK
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index a0aeb982..1db91797 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -129,7 +129,7 @@ def read_config(opts, config_file='config.py'):
 
     # There is no standard, so just set up the most common environment
     # variables
-    for n in ['ANDROID_HOME', 'ANDROID_SDK', 'SDK']:
+    for n in ['ANDROID_HOME', 'ANDROID_SDK']:
         env[n] = config['sdk_path']
     for n in ['ANDROID_NDK', 'NDK']:
         env[n] = config['ndk_path']