Make AndroidCompiler more robust about detecting the cxx-stl location

[builder.git] / source / androidtools.cpp

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index 122dc23392f43017643be5c632454aaf14f45284..809da7dc9e3f45830cc3a18a233812a76961aa6e 100644 (file)
--- a/source/androidtools.cpp
+++ b/source/androidtools.cpp
@@ -3,9 +3,9 @@
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "androidarchiver.h"
 #include "androidassetpackagingtool.h"
-#include "androidccompiler.h"
-#include "androidcxxcompiler.h"
+#include "androidcompiler.h"
 #include "androidlinker.h"
 #include "androidmanifestgenerator.h"
 #include "androidtools.h"
@@ -189,9 +189,10 @@ AndroidTools::AndroidTools(Builder &builder, const Architecture &arch):
        sdk.select_api_level(highest_common);
        ndk.select_api_level(highest_common);
 
-       add_tool(new AndroidCCompiler(builder, arch, ndk));
-       add_tool(new AndroidCxxCompiler(builder, arch, ndk));
+       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));