Provide the AR tool on Android

diff --git a/source/androidarchiver.cpp b/source/androidarchiver.cpp
new file mode 100644 (file)
index 0000000..71bc5ff
--- /dev/null
+++ b/source/androidarchiver.cpp
@@ -0,0 +1,8 @@
+#include "androidarchiver.h"
+#include "androidtools.h"
+
+AndroidArchiver::AndroidArchiver(Builder &b, const Architecture &a, const AndroidNdk &ndk):
+       GnuArchiver(b, a)
+{
+       set_command((ndk.get_bin_dir()/command).str());
+}

diff --git a/source/androidarchiver.h b/source/androidarchiver.h
new file mode 100644 (file)
index 0000000..e09ccec
--- /dev/null
+++ b/source/androidarchiver.h
@@ -0,0 +1,14 @@
+#ifndef ANDROIDARCHIVER_H_
+#define ANDROIDARCHIVER_H_
+
+#include "gnuarchiver.h"
+
+class AndroidNdk;
+
+class AndroidArchiver: public GnuArchiver
+{
+public:
+       AndroidArchiver(Builder &, const Architecture &, const AndroidNdk &);
+};
+
+#endif

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index 122dc23392f43017643be5c632454aaf14f45284..7fd04085ca9cbc12efb698fb268f56eab5c8d9c0 100644 (file)
--- a/source/androidtools.cpp
+++ b/source/androidtools.cpp
@@ -3,6 +3,7 @@
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #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 "androidassetpackagingtool.h"
 #include "androidccompiler.h"
 #include "androidcxxcompiler.h"


@@ -192,6 +193,7 @@ AndroidTools::AndroidTools(Builder &builder, const Architecture &arch):
        add_tool(new AndroidCCompiler(builder, arch, ndk));
        add_tool(new AndroidCxxCompiler(builder, arch, ndk));
        add_tool(new AndroidLinker(builder, arch, ndk));
        add_tool(new AndroidCCompiler(builder, arch, ndk));
        add_tool(new AndroidCxxCompiler(builder, arch, 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));
        add_tool(new AndroidManifestGenerator(builder));
        add_tool(new AndroidAssetPackagingTool(builder, sdk));
        add_tool(new ApkBuilder(builder));