From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 8 Dec 2014 21:53:25 +0000 (+0100)
Subject: switched last aapt call to use central config['aapt']
X-Git-Tag: 0.3.0~13^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f7c9eccc1f44f149692d0c6aaa3eecb29661e197;p=fdroidserver.git

switched last aapt call to use central config['aapt']
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 5dc9b2b1..b16d0b6b 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1597,8 +1597,7 @@ def isApkDebuggable(apkfile, config):
 
     :param apkfile: full path to the apk to check"""
 
-    p = SilentPopen([os.path.join(config['sdk_path'], 'build-tools',
-                                  config['build_tools'], 'aapt'),
+    p = SilentPopen([config['aapt'],
                      'dump', 'xmltree', apkfile, 'AndroidManifest.xml'])
     if p.returncode != 0:
         logging.critical("Failed to get apk manifest information")