Add check_and_install_default_prerequisites so ENV vars are set into the subprocess

misl6 · misl6 · commit efd6260f0d22 · 2022-05-07T17:36:31.000+02:00
diff --git a/pythonforandroid/prerequisites.py b/pythonforandroid/prerequisites.py
@@ -215,8 +215,7 @@ def darwin_installer(self):
         info(f"Setting JAVA_HOME to {jdk_path}")
         os.environ["JAVA_HOME"] = jdk_path
 
-
-if __name__ == "__main__":
+def check_and_install_default_prerequisites():
     DEFAULT_PREREQUISITES = dict(darwin=[JDKPrerequisite()], linux=[], all_platforms=[])
 
     required_prerequisites = (
@@ -242,3 +241,6 @@ def darwin_installer(self):
         prerequisite.show_helper()
         if prerequisite.install_is_supported():
             prerequisite.install()
+
+if __name__ == "__main__":
+    check_and_install_default_prerequisites()
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -13,6 +13,7 @@
     RECOMMENDED_NDK_API, RECOMMENDED_TARGET_API, print_recommendations)
 from pythonforandroid.util import BuildInterruptingException, load_source
 from pythonforandroid.entrypoints import main
+from pythonforandroid.prerequisites import check_and_install_default_prerequisites
 
 
 def check_python_dependencies():
@@ -65,7 +66,7 @@ def check_python_dependencies():
         print('python-for-android is exiting due to the errors logged above')
         exit(1)
 
-
+check_and_install_default_prerequisites()
 check_python_dependencies()
 
 
