X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidtools.cpp;h=c5aab653c51fe3eec613412e1328daead5a2c3a8;hb=6b84e1f5673888753cbe566c1365222ed33fd3ac;hp=b89af6e53d2c23cdc4a5de4c5626f20f7f9ffa07;hpb=cee450d7cc932811b0d119a132bc9981eb480584;p=builder.git

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index b89af6e..c5aab65 100644
--- a/source/androidtools.cpp
+++ b/source/androidtools.cpp
@@ -1,133 +1,250 @@
-#include <cstdlib>
+#include <msp/core/algorithm.h>
+#include <msp/core/environ.h>
 #include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
-#include "androidccompiler.h"
-#include "androidcxxcompiler.h"
+#include "androidarchiver.h"
+#include "androidassetpackagingtool.h"
+#include "androidcompiler.h"
 #include "androidlinker.h"
+#include "androidmanifestgenerator.h"
 #include "androidtools.h"
+#include "apkbuilder.h"
 #include "architecture.h"
 #include "builder.h"
+#include "jarsigner.h"
 
 using namespace std;
 using namespace Msp;
 
-AndroidTools::AndroidTools(Builder &builder, const Architecture &arch):
-	ndk(builder, arch)
+// TODO Mark problems somewhere instead of throwing exceptions
+
+unsigned parse_version(const std::string &version_str)
 {
-	add_tool(new AndroidCCompiler(builder, arch, ndk));
-	add_tool(new AndroidCxxCompiler(builder, arch, ndk));
-	add_tool(new AndroidLinker(builder, arch, ndk));
+	vector<string> version_parts = split(version_str, '.');
+	unsigned version = lexical_cast<unsigned>(version_parts[0])<<16;
+	if(version_parts.size()>1)
+		version += lexical_cast<unsigned>(version_parts[1])<<8;
+	if(version_parts.size()>2)
+		version += lexical_cast<unsigned>(version_parts[2]);
+	return version;
 }
 
 
-AndroidNdk::AndroidNdk(Builder &b, const Architecture &a):
-	builder(b),
-	architecture(a)
+AndroidDevKit::AndroidDevKit(Builder &b, const string &type, const FS::Path &default_path):
+	builder(b)
 {
-	if(const char *env_ndk_root = getenv("ANDROID_NDK_ROOT"))
-		ndk_root = env_ndk_root;
-	else
-		throw runtime_error("ANDROID_NDK_ROOT must be set");
+	string var = format("ANDROID_%s_ROOT", type);
+	root = getenv(var);
+	if(root.empty())
+	{
+		if(!default_path.empty() && FS::exists(default_path))
+			root = default_path;
+		else
+		{
+			builder.get_logger().log("problems", "Android %s not found", type);
+			return;
+		}
+	}
 
-	find_toolchain_dir();
-	find_platform_dir();
+	FS::Path platforms_dir = root/"platforms";
+	if(!FS::exists(platforms_dir))
+		return;
+
+	builder.get_logger().log("files", "Traversing %s", platforms_dir.str());
+	supported_api_levels = 0;
+	for(const string &p: list_filtered(platforms_dir, "^android-[1-9][0-9]*$"))
+	{
+		unsigned api = lexical_cast<unsigned>(p.substr(8));
+		if(api>63)
+			builder.get_logger().log("problems", "API level %d is too high", api);
+		else
+			supported_api_levels |= 1<<api;
+	}
 }
 
-void AndroidNdk::find_toolchain_dir()
+void AndroidDevKit::select_api_level(unsigned api)
 {
-	FS::Path toolchains_dir = ndk_root/"toolchains";
-	list<string> toolchains = list_files(toolchains_dir);
+	if(!(supported_api_levels&(1<<api)))
+		throw invalid_argument("AndroidDevKit::select_api_level");
 
-	string prefix = architecture.get_cross_prefix()+"-";
-	string use_toolchain;
+	init_api_level(api);
+}
+
+
+AndroidSdk::AndroidSdk(Builder &b):
+	AndroidDevKit(b, "SDK")
+{
+	find_build_tools_dir();
+}
+
+void AndroidSdk::find_build_tools_dir()
+{
+	FS::Path bt_dir = root/"build-tools";
+	if(!FS::exists(bt_dir))
+	{
+		builder.get_logger().log("problems", "Android build-tools not found");
+		return;
+	}
+
+	builder.get_logger().log("files", "Traversing %s", bt_dir.str());
+	string use_tools;
 	unsigned latest_version = 0;
-	for(list<string>::const_iterator i=toolchains.begin(); i!=toolchains.end(); ++i)
-		if(!i->compare(0, prefix.size(), prefix))
+	for(const string &v: list_files(bt_dir))
+	{
+		unsigned version = parse_version(v);
+		if(version>latest_version)
 		{
-			string version_str = i->substr(prefix.size());
-			string compiler = "gcc";
-			if(!isdigit(version_str[0]))
-			{
-				unsigned j;
-				for(j=1; (j<version_str.size() && !isdigit(version_str[j])); ++j) ;
-				compiler = version_str.substr(0, j);
-				version_str = version_str.substr(j);
-			}
-
-			if(compiler!="gcc")
-				continue;
-
-			vector<string> version_parts = split(version_str, '.');
-			unsigned version = (lexical_cast<unsigned>(version_parts[0])<<8);
-			if(version_parts.size()>1)
-				version += lexical_cast<unsigned>(version_parts[1]);
-
-			if(version>latest_version)
-			{
-				use_toolchain = *i;
-				latest_version = version;
-			}
+			use_tools = v;
+			latest_version = version;
 		}
+	}
 
-	if(use_toolchain.empty())
-		throw runtime_error("No applicable toolchains found");
+	if(use_tools.empty())
+	{
+		builder.get_logger().log("problems", "Android build-tools not found");
+		return;
+	}
 
-	const Architecture &native_arch = builder.get_native_arch();
+	build_tools_dir = bt_dir/use_tools;
+	builder.get_logger().log("tools", "Android build-tools found in %s", build_tools_dir.str());
+}
+
+void AndroidSdk::init_api_level(unsigned api)
+{
+	platform_jar = root/"platforms"/format("android-%d", api)/"android.jar";
+}
 
-	list<string> tc_archs = list_files(toolchains_dir/use_toolchain/"prebuilt");
-	string use_arch;
-	for(list<string>::const_iterator i=tc_archs.begin(); i!=tc_archs.end(); ++i)
+
+AndroidNdk::AndroidNdk(Builder &b, const Architecture &a, const AndroidSdk &sdk):
+	AndroidDevKit(b, "NDK", create_default_path(sdk)),
+	architecture(a)
+{
+	if(!root.empty())
 	{
-		string tca = *i;
-		for(string::iterator j=tca.begin(); j!=tca.end(); ++j)
-			if(*j=='_')
-				*j = '-';
-		if(native_arch.match_name(tca))
+		FS::Path csr = root/"sysroot";
+		if(FS::exists(csr))
 		{
-			use_arch = *i;
-			break;
+			common_sysroot = csr;
+			builder.get_logger().log("tools", "Android NDK common sysroot is %s", common_sysroot);
 		}
 	}
 
-	if(use_arch.empty())
-		throw runtime_error("No matching toolchain found");
+	find_toolchain_dir();
+}
 
-	bin_dir = toolchains_dir/use_toolchain/"prebuilt"/use_arch/"bin";
+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_platform_dir()
+void AndroidNdk::find_toolchain_dir()
 {
-	FS::Path platforms_dir = ndk_root/"platforms";
-	list<string> platforms = list_files(platforms_dir);
+	if(root.empty())
+		return;
+
+	FS::Path toolchains_dir = root/"toolchains";
+	if(!FS::exists(toolchains_dir))
+	{
+		builder.get_logger().log("problems", "Android NDK toolchains not found");
+		return;
+	}
 
-	string use_platform;
-	unsigned highest_level = 0;
-	for(list<string>::const_iterator i=platforms.begin(); i!=platforms.end(); ++i)
-		if(!i->compare(0, 8, "android-"))
+	builder.get_logger().log("files", "Traversing %s", toolchains_dir.str());
+	string prefix = architecture.get_cross_prefix()+"-";
+	string use_toolchain;
+	unsigned latest_version = 0;
+	for(const string &t: list_filtered(toolchains_dir, "^"+prefix))
+	{
+		string version_str = t.substr(prefix.size());
+		string compiler = "gcc";
+		if(!isdigit(version_str[0]))
 		{
-			unsigned level = lexical_cast<unsigned>(i->substr(8));
-			if(level>highest_level)
-			{
-				use_platform = *i;
-				highest_level = level;
-			}
+			unsigned j;
+			for(j=1; (j<version_str.size() && !isdigit(version_str[j])); ++j) ;
+			compiler = version_str.substr(0, j);
+			version_str = version_str.substr(j);
 		}
 
-	if(use_platform.empty())
-		throw runtime_error("No applicable platforms found");
+		if(compiler!="gcc")
+			continue;
 
-	list<string> platform_archs = list_files(platforms_dir/use_platform);
-	string use_arch;
-	for(list<string>::const_iterator i=platform_archs.begin(); i!=platform_archs.end(); ++i)
-		if(!i->compare(0, 5, "arch-") && architecture.match_name(i->substr(5)))
+		unsigned version = parse_version(version_str);
+		if(version>latest_version)
 		{
-			use_arch = *i;
-			break;
+			use_toolchain = t;
+			latest_version = version;
 		}
+	}
+
+	if(use_toolchain.empty())
+	{
+		builder.get_logger().log("problems", "No applicable Android NDK toolchains found");
+		return;
+	}
+
+	const Architecture &native_arch = builder.get_native_arch();
+
+	FS::Path tc_archs_dir = toolchains_dir/use_toolchain/"prebuilt";
+	builder.get_logger().log("files", "Traversing %s", tc_archs_dir.str());
+	string use_arch = native_arch.best_match(list_files(tc_archs_dir));
+
+	if(use_arch.empty())
+	{
+		builder.get_logger().log("problems", "No applicable Android NDK toolchains found");
+		return;
+	}
+
+	bin_dir = toolchains_dir/use_toolchain/"prebuilt"/use_arch/"bin";
+	builder.get_logger().log("tools", "Android NDK toolchain binaries found in %s", bin_dir.str());
+}
+
+void AndroidNdk::init_api_level(unsigned api)
+{
+	FS::Path platform_archs_dir = root/"platforms"/format("android-%d", api);
+	builder.get_logger().log("files", "Traversing %s", platform_archs_dir.str());
+	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())
-		throw runtime_error("No matching platform found");
+	{
+		builder.get_logger().log("problems", "No matching Android NDK platform found");
+		return;
+	}
 
-	platform_sysroot = platforms_dir/use_platform/use_arch;
+	platform_sysroot = platform_archs_dir/("arch-"+use_arch);
+	builder.get_logger().log("tools", "Android NDK platform sysroot is %s", platform_sysroot);
+}
+
+
+AndroidTools::AndroidTools(Builder &builder, const Architecture &arch):
+	sdk(builder),
+	ndk(builder, arch, sdk)
+{
+	if(uint64_t common_api_levels = sdk.get_supported_api_levels()&ndk.get_supported_api_levels())
+	{
+		unsigned api = 0;
+		for(unsigned i=32; i>0; i>>=1)
+			api += i*!!(common_api_levels>>(api+i));
+		builder.get_logger().log("tools", "Using Android API level %d", api);
+		sdk.select_api_level(api);
+		ndk.select_api_level(api);
+	}
+	else
+		builder.get_logger().log("problems", "No usable Android platforms found");
+
+	add_tool(new AndroidCompiler(builder, arch, "CC", ndk));
+	add_tool(new AndroidCompiler(builder, arch, "CXX", ndk));
+	add_tool(new AndroidLinker(builder, arch, ndk));
+	add_tool(new AndroidArchiver(builder, arch, ndk));
+	add_tool(new AndroidManifestGenerator(builder));
+	add_tool(new AndroidAssetPackagingTool(builder, sdk));
+	add_tool(new ApkBuilder(builder));
+	add_tool(new JarSigner(builder));
 }