From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 29 Dec 2022 16:34:21 +0000 (+0200)
Subject: Check for existence of Android NDK in AndroidLinker
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=9ae890e43e26a651ce564db87b9c0f01f51f5eb8;p=builder.git

Check for existence of Android NDK in AndroidLinker
---

diff --git a/plugins/android/androidlinker.cpp b/plugins/android/androidlinker.cpp
index ec90249..8c6e9a4 100644
--- a/plugins/android/androidlinker.cpp
+++ b/plugins/android/androidlinker.cpp
@@ -6,10 +6,15 @@ using namespace std;
 AndroidLinker::AndroidLinker(Builder &b, const Architecture &a, const AndroidNdk &ndk):
 	CustomizedTool(b, "LINK", a)
 {
-	build_info.sysroot = ndk.get_platform_sysroot();
-
 	set_command("gcc", true);
-	set_command((ndk.get_bin_dir()/command).str());
+	if(ndk.get_root_dir().empty())
+		problems.push_back("Android NDK not found");
+	else if(ndk.get_bin_dir().empty())
+		problems.push_back("Android NDK toolchain not found");
+	else
+		set_command((ndk.get_bin_dir()/command).str());
+
+	build_info.sysroot = ndk.get_platform_sysroot();
 }
 
 Target *AndroidLinker::create_target(const vector<Target *> &sources, const string &)