Improve problem reporting for the Android toolchain

[builder.git] / source / androidassetpackagingtool.cpp

diff --git a/source/androidassetpackagingtool.cpp b/source/androidassetpackagingtool.cpp
index cca30b806168f615124058e0d028d27530d826d7..9e0fef75a990f8252d226ceda12dd396fe84fe60 100644 (file)
--- a/source/androidassetpackagingtool.cpp
+++ b/source/androidassetpackagingtool.cpp
@@ -14,7 +14,15 @@ AndroidAssetPackagingTool::AndroidAssetPackagingTool(Builder &b, const AndroidSd
        Tool(b, "AAPT"),
        sdk(s)
 {
-       set_command((sdk.get_build_tools_dir()/"aapt").str());
+       if(sdk.get_root_dir().empty())
+               problems.push_back("Android SDK not found");
+       else if(sdk.get_build_tools_dir().empty())
+               problems.push_back("Android build-tools not found");
+       else
+               set_command((sdk.get_build_tools_dir()/"aapt").str());
+
+       if(sdk.get_platform_jar().empty())
+               problems.push_back("Android platform not found");
 }
 
 Target *AndroidAssetPackagingTool::create_target(const list<Target *> &sources, const string &)