Also check that platform-tools and tools exist

This commit is contained in:
Daniel Martí 2014-07-03 18:23:35 +02:00
parent a8d4c8705f
commit 8306bac7de

View file

@ -186,9 +186,11 @@ def test_sdk_exists(c):
if not os.path.isdir(c['sdk_path']): if not os.path.isdir(c['sdk_path']):
logging.critical('Android SDK path "' + c['sdk_path'] + '" is not a directory!') logging.critical('Android SDK path "' + c['sdk_path'] + '" is not a directory!')
return False return False
if not os.path.isdir(os.path.join(c['sdk_path'], 'build-tools')): for d in ['build-tools', 'platform-tools', 'tools']:
logging.critical('Android SDK path "' + c['sdk_path'] + '" does not contain "build-tools/"!') if not os.path.isdir(os.path.join(c['sdk_path'], d)):
return False logging.critical('Android SDK path "%s" does not contain "%s/"!' % (
c['sdk_path'], d))
return False
return True return True