X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=942e5a3bcca4c6250a2564a6ca9aedf00a623e83;hb=68f084e4ed817da0c25cefa1772cadf97b8cfe5e;hp=9738146423de46bc9152b7bdfac60f6734a8b639;hpb=11b4732f81396aa3d8b0fc8928b8e1981032e743;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 9738146..942e5a3 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -5,6 +5,7 @@
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "androidapplicationcomponent.h"
 #include "binarycomponent.h"
 #include "binarypackage.h"
 #include "booleanevaluator.h"
@@ -158,17 +159,18 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
 void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
 	options = o;
-	add("description", &SourcePackage::description);
+	add("android_application", &Loader::component<AndroidApplicationComponent>);
 	add("build_info",  &Loader::build_info);
+	add("datapack",    &Loader::component<DataPackComponent>);
+	add("description", &SourcePackage::description);
 	add("feature",     &Loader::feature);
 	add("generate",    &Loader::generate);
 	add("if_feature",  &Loader::if_feature);
-	add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
-	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
-	add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
 	add("install",     &Loader::component<InstallComponent>);
 	add("interface_version", &Loader::interface_version);
-	add("datapack",    &Loader::component<DataPackComponent>);
+	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
+	add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
+	add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
 	add("source_archive", &Loader::source_archive);
 	add("source_tarball", &Loader::source_archive);
 	add("tarball",     &Loader::tarball);