kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-08 10:10:10 +02:00
Code Activity

support official ANDROID_SDK_ROOT env var when running CLI tools

Browse Source 
ANDROID_HOME is deprecated:
https://developer.android.com/studio/command-line/variables#android_sdk_root

!816 #547
This commit is contained in:
Hans-Christoph Steiner 2021-01-29 16:28:00 +01:00
parent 4900c426e9
commit 31c29f2fb3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/common.py
View File

@ -2739,7 +2739,7 @@ def set_FDroidPopen_env(build=None):
orig_path = env['PATH']
if config:
if config.get('sdk_path'):
for n in ['ANDROID_HOME', 'ANDROID_SDK']:
for n in ['ANDROID_HOME', 'ANDROID_SDK', 'ANDROID_SDK_ROOT']:
env[n] = config['sdk_path']
for k, v in config.get('java_paths', {}).items():
env['JAVA%s_HOME' % k] = v