mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

'aapt' tool moved in SDK r22, adding support to run.py

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-05-19 14:57:21 +04:00
parent aee6a617a6
commit 4af104aaae
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ts/misc/run.py
View File

@ -288,6 +288,16 @@ class TestSuite(object):
if self.adb: if self.adb:
# construct name for aapt tool # construct name for aapt tool
self.aapt = [os.path.join(os.path.dirname(self.adb[0]), ("aapt","aapt.exe")[hostos == 'nt'])] 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 # fix has_perf_tests param
self.has_perf_tests = self.has_perf_tests == "ON" self.has_perf_tests = self.has_perf_tests == "ON"