Adapt to changes in mspcore

[builder.git] / source / androidtools.cpp

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index eeb6edf532d379948739e5efde7ee3b028c6bc06..93b7bfac7a05d941f128ab55fcf05c088736e51d 100644 (file)
--- a/source/androidtools.cpp
+++ b/source/androidtools.cpp
@@ -51,9 +51,9 @@ AndroidDevKit::AndroidDevKit(Builder &b, const string &type, const FS::Path &def
                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)));
 }
 
@@ -82,11 +82,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)
@@ -150,11 +150,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";
@@ -203,8 +203,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);