Refactor transitive dependencies to work on all targets

[builder.git] / source / androidcompiler.cpp

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
deleted file mode 100644 (file)
index 3616cf4..0000000
--- a/source/androidcompiler.cpp
+++ /dev/null
@@ -1,75 +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, n.get_platform_sysroot()),
-       ndk(n)
-{
-       set_command((ndk.get_bin_dir()/command).str());
-       build_info.incpath.insert(build_info.incpath.end(), system_path.begin(), system_path.end());
-       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);
-               }
-       }
-}