mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

init: make work with only androguard, no Android SDK

Browse source
This commit is contained in:
Hans-Christoph Steiner 2018-05-03 14:56:05 +02:00
parent 9cc8826a79
commit cf1ce46e5c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/init.py
View file

@ -75,6 +75,8 @@ def main():
# in ANDROID_HOME if that exists, otherwise None # in ANDROID_HOME if that exists, otherwise None
if options.android_home is not None: if options.android_home is not None:
test_config['sdk_path'] = options.android_home test_config['sdk_path'] = options.android_home
elif common.use_androguard():
pass
elif not common.test_sdk_exists(test_config): elif not common.test_sdk_exists(test_config):
if os.path.isfile('/usr/bin/aapt'): if os.path.isfile('/usr/bin/aapt'):
# remove sdk_path and build_tools, they are not required # remove sdk_path and build_tools, they are not required
@ -110,7 +112,8 @@ def main():
test_config['sdk_path'] = s test_config['sdk_path'] = s
if common.test_sdk_exists(test_config): if common.test_sdk_exists(test_config):
break break
if not common.test_sdk_exists(test_config): if (options.android_home is not None or not common.use_androguard()) \
and not common.test_sdk_exists(test_config):
raise FDroidException("Android SDK not found.") raise FDroidException("Android SDK not found.")
if not os.path.exists('config.py'): if not os.path.exists('config.py'):