X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidtools.cpp;h=5ef2bec5f23b40ec3ff31a58be99d3d1189ece0e;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=15126734de660f128b006573713eaf21f71a4874;hpb=d774d554c4c15b963215212b26a9ee5df3d705e8;p=builder.git

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index 1512673..5ef2bec 100644
--- 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,10 +53,8 @@ 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]*$");
-
-	for(list<string>::const_iterator i=platforms.begin(); i!=platforms.end(); ++i)
-		supported_api_levels.insert(lexical_cast<unsigned>(i->substr(8)));
+	for(const string &p: list_filtered(platforms_dir, "^android-[1-9][0-9]*$"))
+		supported_api_levels.insert(lexical_cast<unsigned>(p.substr(8)));
 }
 
 void AndroidDevKit::select_api_level(unsigned api)
@@ -80,16 +82,14 @@ 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);
-
 	string use_tools;
 	unsigned latest_version = 0;
-	for(list<string>::const_iterator i=tool_versions.begin(); i!=tool_versions.end(); ++i)
+	for(const string &v: list_files(bt_dir))
 	{
-		unsigned version = parse_version(*i);
+		unsigned version = parse_version(v);
 		if(version>latest_version)
 		{
-			use_tools = *i;
+			use_tools = v;
 			latest_version = version;
 		}
 	}
@@ -110,8 +110,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 +127,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,13 +148,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);
-
 	string use_toolchain;
 	unsigned latest_version = 0;
-	for(list<string>::const_iterator i=toolchains.begin(); i!=toolchains.end(); ++i)
+	for(const string &t: list_filtered(toolchains_dir, "^"+prefix))
 	{
-		string version_str = i->substr(prefix.size());
+		string version_str = t.substr(prefix.size());
 		string compiler = "gcc";
 		if(!isdigit(version_str[0]))
 		{
@@ -163,7 +168,7 @@ void AndroidNdk::find_toolchain_dir()
 		unsigned version = parse_version(version_str);
 		if(version>latest_version)
 		{
-			use_toolchain = *i;
+			use_toolchain = t;
 			latest_version = version;
 		}
 	}
@@ -194,9 +199,9 @@ 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)
-		i->erase(0, 5);
+	vector<string> platform_archs = list_filtered(platform_archs_dir, "^arch-");
+	for(string &a: platform_archs)
+		a.erase(0, 5);
 	string use_arch = architecture.best_match(platform_archs);
 
 	if(use_arch.empty())
@@ -212,12 +217,12 @@ 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();
 	unsigned highest_common = 0;
-	for(set<unsigned>::const_reverse_iterator i=sdk_api_levels.rbegin(); (!highest_common && i!=sdk_api_levels.rend()); ++i)
+	for(auto i=sdk_api_levels.rbegin(); (!highest_common && i!=sdk_api_levels.rend()); ++i)
 		if(ndk_api_levels.count(*i))
 			highest_common = *i;