mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-06 11:00:13 +02:00
support official ANDROID_SDK_ROOT env var when running CLI tools
ANDROID_HOME is deprecated: https://developer.android.com/studio/command-line/variables#android_sdk_root !816 #547
This commit is contained in:
parent
4900c426e9
commit
31c29f2fb3
@ -2739,7 +2739,7 @@ def set_FDroidPopen_env(build=None):
|
|||||||
orig_path = env['PATH']
|
orig_path = env['PATH']
|
||||||
if config:
|
if config:
|
||||||
if config.get('sdk_path'):
|
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']
|
env[n] = config['sdk_path']
|
||||||
for k, v in config.get('java_paths', {}).items():
|
for k, v in config.get('java_paths', {}).items():
|
||||||
env['JAVA%s_HOME' % k] = v
|
env['JAVA%s_HOME' % k] = v
|
||||||
|
Loading…
Reference in New Issue
Block a user