Use getenv from mspcore

[builder.git] / source / androidtools.cpp

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index 15126734de660f128b006573713eaf21f71a4874..118926e1aa3e29dd277d77f138090c65305536b2 100644 (file)
--- a/source/androidtools.cpp
+++ b/source/androidtools.cpp
@@ -1,4 +1,4 @@
-#include <cstdlib>
+#include <msp/core/environ.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/strings/format.h>
@@ -32,16 +32,20 @@ unsigned parse_version(const std::string &version_str)
 }
 
 
-AndroidDevKit::AndroidDevKit(Builder &b, const string &type):
+AndroidDevKit::AndroidDevKit(Builder &b, const string &type, const FS::Path &default_path):
        builder(b)
 {
        string var = format("ANDROID_%s_ROOT", type);
-       if(const char *value = getenv(var.c_str()))
-               root = value;
-       else
+       root = getenv(var);
+       if(root.empty())
        {
-               builder.get_logger().log("problems", format("Android %s not found", type));
-               return;
+               if(!default_path.empty() && FS::exists(default_path))
+                       root = default_path;
+               else
+               {
+                       builder.get_logger().log("problems", format("Android %s not found", type));
+                       return;
+               }
        }
 
        FS::Path platforms_dir = root/"platforms";
@@ -49,9 +53,9 @@ AndroidDevKit::AndroidDevKit(Builder &b, const string &type):
                return;
 
        builder.get_logger().log("files", format("Traversing %s", platforms_dir.str()));
-       list<string> platforms = list_filtered(platforms_dir, "^android-[1-9][0-9]*$");
+       vector<string> platforms = list_filtered(platforms_dir, "^android-[1-9][0-9]*$");
 
-       for(list<string>::const_iterator i=platforms.begin(); i!=platforms.end(); ++i)
+       for(vector<string>::const_iterator i=platforms.begin(); i!=platforms.end(); ++i)
                supported_api_levels.insert(lexical_cast<unsigned>(i->substr(8)));
 }
 
@@ -80,11 +84,11 @@ void AndroidSdk::find_build_tools_dir()
        }
 
        builder.get_logger().log("files", format("Traversing %s", bt_dir.str()));
-       list<string> tool_versions = list_files(bt_dir);
+       vector<string> tool_versions = list_files(bt_dir);
 
        string use_tools;
        unsigned latest_version = 0;
-       for(list<string>::const_iterator i=tool_versions.begin(); i!=tool_versions.end(); ++i)
+       for(vector<string>::const_iterator i=tool_versions.begin(); i!=tool_versions.end(); ++i)
        {
                unsigned version = parse_version(*i);
                if(version>latest_version)
@@ -110,8 +114,8 @@ void AndroidSdk::init_api_level(unsigned api)
 }
 
 
-AndroidNdk::AndroidNdk(Builder &b, const Architecture &a):
-       AndroidDevKit(b, "NDK"),
+AndroidNdk::AndroidNdk(Builder &b, const Architecture &a, const AndroidSdk &sdk):
+       AndroidDevKit(b, "NDK", create_default_path(sdk)),
        architecture(a)
 {
        if(!root.empty())
@@ -127,6 +131,13 @@ AndroidNdk::AndroidNdk(Builder &b, const Architecture &a):
        find_toolchain_dir();
 }
 
+FS::Path AndroidNdk::create_default_path(const AndroidSdk &sdk)
+{
+       if(sdk.get_root_dir().empty())
+               return FS::Path();
+       return sdk.get_root_dir()/"ndk-bundle";
+}
+
 void AndroidNdk::find_toolchain_dir()
 {
        if(root.empty())
@@ -141,11 +152,11 @@ void AndroidNdk::find_toolchain_dir()
 
        builder.get_logger().log("files", format("Traversing %s", toolchains_dir.str()));
        string prefix = architecture.get_cross_prefix()+"-";
-       list<string> toolchains = list_filtered(toolchains_dir, "^"+prefix);
+       vector<string> toolchains = list_filtered(toolchains_dir, "^"+prefix);
 
        string use_toolchain;
        unsigned latest_version = 0;
-       for(list<string>::const_iterator i=toolchains.begin(); i!=toolchains.end(); ++i)
+       for(vector<string>::const_iterator i=toolchains.begin(); i!=toolchains.end(); ++i)
        {
                string version_str = i->substr(prefix.size());
                string compiler = "gcc";
@@ -194,8 +205,8 @@ void AndroidNdk::init_api_level(unsigned api)
 {
        FS::Path platform_archs_dir = root/"platforms"/format("android-%d", api);
        builder.get_logger().log("files", format("Traversing %s", platform_archs_dir.str()));
-       list<string> platform_archs = list_filtered(platform_archs_dir, "^arch-");
-       for(list<string>::iterator i=platform_archs.begin(); i!=platform_archs.end(); ++i)
+       vector<string> platform_archs = list_filtered(platform_archs_dir, "^arch-");
+       for(vector<string>::iterator i=platform_archs.begin(); i!=platform_archs.end(); ++i)
                i->erase(0, 5);
        string use_arch = architecture.best_match(platform_archs);
 
@@ -212,7 +223,7 @@ void AndroidNdk::init_api_level(unsigned api)
 
 AndroidTools::AndroidTools(Builder &builder, const Architecture &arch):
        sdk(builder),
-       ndk(builder, arch)
+       ndk(builder, arch, sdk)
 {
        const set<unsigned> &sdk_api_levels = sdk.get_supported_api_levels();
        const set<unsigned> &ndk_api_levels = ndk.get_supported_api_levels();