From 31c29f2fb37c4de9cf04d92b98ca9a7d54fb0172 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 29 Jan 2021 16:28:00 +0100
Subject: [PATCH] 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
---
 fdroidserver/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9cd538ab..a19795a0 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -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