Set PATH using real SDK and NDK directories

dbnicholson · dbnicholson · commit 86e99bff2dd0 · 2022-04-19T13:42:35.000-06:00
This is a regression from f7f8cea. Previously, `self.sdk_dir` and `self.ndk_dir` were passed to `select_and_check_toolchain_version`.
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -370,9 +370,9 @@ def prepare_build_environment(self,
 
         self.env["PATH"] = ":".join(
             [
-                f"{ndk_dir}/toolchains/llvm/prebuilt/{py_platform}-x86_64/bin",
+                f"{self.ndk_dir}/toolchains/llvm/prebuilt/{py_platform}-x86_64/bin",
                 ndk_dir,
-                f"{sdk_dir}/tools",
+                f"{self.sdk_dir}/tools",
                 environ.get("PATH"),
             ]
         )

Original file line number	Diff line number	Diff line change
`@@ -370,9 +370,9 @@ def prepare_build_environment(self,`
`370`	`370`
`371`	`371`	`self.env["PATH"] = ":".join(`
`372`	`372`	`[`
`373`		`- f"{ndk_dir}/toolchains/llvm/prebuilt/{py_platform}-x86_64/bin",`
	`373`	`+ f"{self.ndk_dir}/toolchains/llvm/prebuilt/{py_platform}-x86_64/bin",`
`374`	`374`	`ndk_dir,`
`375`		`- f"{sdk_dir}/tools",`
	`375`	`+ f"{self.sdk_dir}/tools",`
`376`	`376`	`environ.get("PATH"),`
`377`	`377`	`]`
`378`	`378`	`)`