Redesign how tools are run

[builder.git] / source / apkbuilder.h

diff --git a/source/apkbuilder.h b/source/apkbuilder.h
index 7b73aa7620601be5d169035011c91bf55e319237..09d849c659f6e72ddc2067366dd4f00d6a00a6b9 100644 (file)
--- a/source/apkbuilder.h
+++ b/source/apkbuilder.h
@@ -3,19 +3,22 @@
 
 #include "tool.h"
 
+class AndroidPackageFile;
+
 class ApkBuilder: public Tool
 {
 private:
-       Tool *jarsigner;
+       Tool *jarsigner = 0;
 
 public:
        ApkBuilder(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
+       Target *create_target(const std::vector<Target *> &, const std::string &) override;
 protected:
-       virtual void do_prepare();
-public:
-       virtual Task *run(const Target &) const;
+       void do_prepare() override;
+
+private:
+       static Task *_run(const AndroidPackageFile &);
 };
 
 #endif