X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fandroidapplicationcomponent.cpp;h=1aab7355009444a8e98c6c136b9232e633a9c90c;hb=6b84e1f5673888753cbe566c1365222ed33fd3ac;hp=95eb9447dc3fe8bd88e684d1e86a6c876ef3f9a7;hpb=8b133e26e29abbe79886c47d57637eb18ea9cb24;p=builder.git

diff --git a/source/androidapplicationcomponent.cpp b/source/androidapplicationcomponent.cpp
index 95eb944..1aab735 100644
--- a/source/androidapplicationcomponent.cpp
+++ b/source/androidapplicationcomponent.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "androidapplicationcomponent.h"
@@ -22,7 +23,7 @@ void AndroidApplicationComponent::create_targets() const
 	Builder &builder = package.get_builder();
 	BuildGraph &build_graph = builder.get_build_graph();
 
-	list<Target *> contents;
+	vector<Target *> contents;
 	for(const auto &kvp: build_graph.get_targets())
 		if(kvp.second->get_package()==&package)
 			if(InstalledFile *inst = dynamic_cast<InstalledFile *>(kvp.second))
@@ -33,7 +34,7 @@ void AndroidApplicationComponent::create_targets() const
 	for(const string &p: permissions)
 		manifest->add_permission(p);
 
-	list<Target *> resource_sources;
+	vector<Target *> resource_sources;
 	resource_sources.push_back(manifest);
 
 	const Toolchain &toolchain = builder.get_toolchain();
@@ -47,7 +48,8 @@ void AndroidApplicationComponent::create_targets() const
 	Tool &aapt = toolchain.get_tool("AAPT");
 	Target *resource_bundle = aapt.create_target(resource_sources);
 
-	list<Target *> apk_sources;
+	vector<Target *> apk_sources;
+	apk_sources.reserve(1+contents.size());
 	apk_sources.push_back(resource_bundle);
 
 	const Architecture &arch = package.get_builder().get_current_arch();
@@ -90,5 +92,6 @@ AndroidApplicationComponent::Loader::Loader(AndroidApplicationComponent &c):
 
 void AndroidApplicationComponent::Loader::permission(const string &perm)
 {
-	obj.permissions.insert(perm);
+	if(!any_equals(obj.permissions, perm))
+		obj.permissions.push_back(perm);
 }