X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flib%2Fbuilder.cpp;h=9cf6266af8fef3d03db31b9d6d81e33310220bfc;hb=767e28373e9710720efabc0f4f9bb3e51661c1e6;hp=1535c3e948bf3a1cd7042649347bd3feb8b5d81f;hpb=c26f1550706f1f674d3040ebb42d2b35d21952ff;p=builder.git

diff --git a/source/lib/builder.cpp b/source/lib/builder.cpp
index 1535c3e..9cf6266 100644
--- a/source/lib/builder.cpp
+++ b/source/lib/builder.cpp
@@ -12,15 +12,14 @@
 #include <msp/strings/format.h>
 #include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
-#include "android/androidtools.h"
 #include "binarypackage.h"
 #include "builder.h"
-#include "datafile/datatool.h"
 #include "installedfile.h"
 #include "package.h"
 #include "plugin.h"
 #include "sharedlibrary.h"
 #include "task.h"
+#include "tool.h"
 #include "virtualtarget.h"
 
 using namespace std;
@@ -141,9 +140,6 @@ void Builder::update_auto_prefix()
 
 void Builder::add_default_tools()
 {
-	if(current_arch->get_system()=="android")
-		toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
-	toolchain.add_tool(new DataTool(*this));
 	for(const LoadedPlugin &p: plugins)
 		p.plugin->add_tools(toolchain, *current_arch);