#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"
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));