-#include <cstdlib>
+#include <msp/core/environ.h>
#include <msp/fs/dir.h>
#include <msp/fs/stat.h>
#include <msp/strings/format.h>
builder(b)
{
string var = format("ANDROID_%s_ROOT", type);
- if(const char *value = getenv(var.c_str()))
- root = value;
- else if(!default_path.empty() && FS::exists(default_path))
- root = default_path;
- 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";
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)));
}
}
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)
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";
{
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);