Remove deprecated parameter

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 72eba2582863ab85b78f4bb519824113a55ab9cf..e51716b2197e62db3faaad0d0be0c666df9c2d46 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -470,7 +470,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         src = os.path.join(bindir, src)
 
     # Make sure it's not debuggable...
-    if not install and common.isApkDebuggable(src, sdk_path):
+    if not install and common.isApkDebuggable(src):
         raise BuildException("APK is debuggable")
 
     # By way of a sanity check, make sure the version and version

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 8f3d5551c8c4cb558f883c30ec13a6b45674a9c5..229fd42fd2b23fea2a22fed2183e49d62d7057d4 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1560,11 +1560,10 @@ class KnownApks:
         lst.reverse()
         return lst
 
-def isApkDebuggable(apkfile, sdk_path):
+def isApkDebuggable(apkfile):
     """Returns True if the given apk file is debuggable
 
-    :param apkfile: full path to the apk to check
-    :param sdk_path: path to android sdk (deprecated)"""
+    :param apkfile: full path to the apk to check"""
 
     if ('aapt_path' not in globals()):
         # (re-)read configuration

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 435faed5e0a165119d92b28da8b9d4a2d05ea85a..c705cb4bbbd1d1a545125742d9910eb77c3bbb22 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -318,7 +318,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 thisinfo['sdkversion'] = 0
 
             # Check for debuggable apks...
-            if common.isApkDebuggable(apkfile, sdk_path):
+            if common.isApkDebuggable(apkfile):
                 print "WARNING: {0} is debuggable... {1}".format(apkfile, line)
 
             # Calculate the md5 and sha256...