Skip to content

Commit 72e9720

Browse files
committed
Add check_and_install_default_prerequisites so ENV vars are set into the subprocess
1 parent 0de9354 commit 72e9720

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

pythonforandroid/prerequisites.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def darwin_installer(self):
216216
os.environ["JAVA_HOME"] = jdk_path
217217

218218

219-
if __name__ == "__main__":
219+
def check_and_install_default_prerequisites():
220220
DEFAULT_PREREQUISITES = dict(darwin=[JDKPrerequisite()], linux=[], all_platforms=[])
221221

222222
required_prerequisites = (
@@ -242,3 +242,7 @@ def darwin_installer(self):
242242
prerequisite.show_helper()
243243
if prerequisite.install_is_supported():
244244
prerequisite.install()
245+
246+
247+
if __name__ == "__main__":
248+
check_and_install_default_prerequisites()

pythonforandroid/toolchain.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
RECOMMENDED_NDK_API, RECOMMENDED_TARGET_API, print_recommendations)
1414
from pythonforandroid.util import BuildInterruptingException, load_source
1515
from pythonforandroid.entrypoints import main
16+
from pythonforandroid.prerequisites import check_and_install_default_prerequisites
1617

1718

1819
def check_python_dependencies():
@@ -66,6 +67,7 @@ def check_python_dependencies():
6667
exit(1)
6768

6869

70+
check_and_install_default_prerequisites()
6971
check_python_dependencies()
7072

7173

0 commit comments

Comments
 (0)