X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidcompiler.cpp;h=68c4e56d2ad675a4ac64f72a492f4ff38305e78c;hb=HEAD;hp=cdd98af34f5095dd853521535091e5b37e0fc4e8;hpb=d774d554c4c15b963215212b26a9ee5df3d705e8;p=builder.git

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
deleted file mode 100644
index cdd98af..0000000
--- a/source/androidcompiler.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <msp/fs/dir.h>
-#include <msp/fs/stat.h>
-#include <msp/fs/utils.h>
-#include <msp/strings/format.h>
-#include <msp/strings/utils.h>
-#include "androidcompiler.h"
-#include "androidtools.h"
-#include "builder.h"
-#include "externaltask.h"
-#include "filetarget.h"
-
-using namespace std;
-using namespace Msp;
-
-AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string &t, const AndroidNdk &n):
-	GnuCompiler(b, a, t),
-	ndk(n)
-{
-	if(ndk.get_root_dir().empty())
-		problems.push_back("Android NDK not found");
-	else if(ndk.get_bin_dir().empty())
-		problems.push_back("Android NDK toolchain not found");
-	else
-		set_command((ndk.get_bin_dir()/command).str());
-
-	if(ndk.get_platform_sysroot().empty())
-		problems.push_back("Android platform not found");
-	else if(!ndk.get_common_sysroot().empty())
-	{
-		build_info.sysroot = ndk.get_common_sysroot();
-		/* The common sysroot has asm headers in arch directories and the
-		compiler doesn't pick them up automatically */
-		build_info.incpath.push_back(ndk.get_common_sysroot()/"usr/include"/architecture->get_cross_prefix());
-	}
-	else
-		build_info.sysroot = ndk.get_platform_sysroot();
-
-	if(tag=="CXX")
-		build_info.libs.push_back("gnustl_static");
-}
-
-void AndroidCompiler::do_prepare()
-{
-	GnuCompiler::do_prepare();
-	if(executable && tag=="CXX")
-	{
-		ExternalTask::Arguments argv;
-		argv.push_back(executable->get_path().str());
-		argv.push_back("-dumpversion");
-
-		builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
-		string version;
-		try
-		{
-			version = strip(ExternalTask::run_and_capture_output(argv));
-			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
-		}
-		catch(const runtime_error &)
-		{ }
-
-		FS::Path libstdcxx_dir = ndk.get_root_dir()/"sources"/"cxx-stl"/"gnu-libstdc++";
-		FS::Path libstdcxx_path;
-		while(1)
-		{
-			libstdcxx_path = libstdcxx_dir/version;
-			if(FS::exists(libstdcxx_path))
-				break;
-
-			string::size_type dot = version.rfind('.');
-			if(dot==string::npos)
-			{
-				problems.push_back("C++ standard library not found");
-				return;
-			}
-
-			version = version.substr(0, dot);
-		}
-
-		FS::Path public_dir = libstdcxx_path/"include";
-		system_path.push_back(public_dir);
-		build_info.incpath.push_back(public_dir);
-
-		FS::Path arch_path = libstdcxx_path/"libs";
-		builder.get_logger().log("files", format("Traversing %s", arch_path.str()));
-		string arch_dir = architecture->best_match(list_files(arch_path));
-		if(!arch_dir.empty())
-		{
-			build_info.incpath.push_back(libstdcxx_path/"libs"/arch_dir/"include");
-			build_info.libpath.push_back(libstdcxx_path/"libs"/arch_dir);
-		}
-	}
-}