From 4af104aaae596158a4464276aad96a033412166e Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Sun, 19 May 2013 14:57:21 +0400 Subject: [PATCH] 'aapt' tool moved in SDK r22, adding support to run.py --- modules/ts/misc/run.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/ts/misc/run.py b/modules/ts/misc/run.py index 435171371..a64127f0d 100755 --- a/modules/ts/misc/run.py +++ b/modules/ts/misc/run.py @@ -288,6 +288,16 @@ class TestSuite(object): if self.adb: # construct name for aapt tool self.aapt = [os.path.join(os.path.dirname(self.adb[0]), ("aapt","aapt.exe")[hostos == 'nt'])] + if not os.path.isfile(self.aapt[0]): + # it's moved in SDK r22 + sdk_dir = os.path.dirname( os.path.dirname(self.adb[0]) ) + aapt_fn = ("aapt", "aapt.exe")[hostos == 'nt'] + for r, ds, fs in os.walk( os.path.join(sdk_dir, 'build-tools') ): + if aapt_fn in fs: + self.aapt = [ os.path.join(r, aapt_fn) ] + break + else: + self.error = "Can't find '%s' tool!" % aapt_fn # fix has_perf_tests param self.has_perf_tests = self.has_perf_tests == "ON"