#include "androidresourcebundle.h"
#include "androidtools.h"
#include "component.h"
-#include "externaltask.h"
#include "sourcepackage.h"
using namespace std;
if(sdk.get_platform_jar().empty())
problems.push_back("Android platform not found");
- set_run(_run);
+ set_run_external(_run);
}
Target *AndroidAssetPackagingTool::create_target(const vector<Target *> &sources, const string &)
return res;
}
-Task *AndroidAssetPackagingTool::_run(const AndroidResourceBundle &res)
+ExternalTask::Arguments AndroidAssetPackagingTool::_run(const AndroidResourceBundle &res, FS::Path &work_dir)
{
const AndroidAssetPackagingTool &tool = dynamic_cast<const AndroidAssetPackagingTool &>(*res.get_tool());
argv.push_back(tool.get_executable()->get_path().str());
argv.push_back("package");
- FS::Path work_dir = res.get_component()->get_package().get_source_directory();
-
argv.push_back("-I");
argv.push_back(tool.sdk.get_platform_jar().str());
argv.push_back(FS::relative(d, work_dir).str());
}
- return new ExternalTask(argv, work_dir);
+ return argv;
}