X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidmanifestgenerator.cpp;h=8268bb80984d0ff075f89d2a6539b86803357315;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=156dfb35fd9abcdbca33710c5ce4f70b2edf71a0;hpb=3e23be616412a2b9b9a3348dad618fb399f96f67;p=builder.git

diff --git a/source/androidmanifestgenerator.cpp b/source/androidmanifestgenerator.cpp
index 156dfb3..8268bb8 100644
--- a/source/androidmanifestgenerator.cpp
+++ b/source/androidmanifestgenerator.cpp
@@ -9,11 +9,7 @@
 using namespace std;
 using namespace Msp;
 
-AndroidManifestGenerator::AndroidManifestGenerator(Builder &b):
-	Tool(b, "AMG")
-{ }
-
-Target *AndroidManifestGenerator::create_target(const list<Target *> &, const string &)
+Target *AndroidManifestGenerator::create_target(const vector<Target *> &, const string &)
 {
 	throw logic_error("not implemented");
 }
@@ -26,10 +22,6 @@ Task *AndroidManifestGenerator::run(const Target &target) const
 }
 
 
-AndroidManifestGenerator::Worker::Worker(const AndroidManifestFile &m):
-	manifest(m)
-{ }
-
 void AndroidManifestGenerator::Worker::main()
 {
 	const Component &comp = *manifest.get_component();
@@ -47,7 +39,11 @@ void AndroidManifestGenerator::Worker::main()
 	IO::print(out, "\t<application android:icon=\"@drawable/icon\" android:label=\"%s\" android:hasCode=\"false\" android:debuggable=\"%s\">\n", pkg.get_label(), debuggable);
 	if(SharedLibrary *native_lib = manifest.get_native_library())
 	{
-		out.write("\t\t<activity android:name=\"android.app.NativeActivity\">\n");
+		out.write("\t\t<activity android:name=\"android.app.NativeActivity\"");
+		const string &orientation = manifest.get_orientation();
+		if(!orientation.empty())
+			IO::print(out, " android:screenOrientation=\"%s\"", orientation);
+		out.write(">\n");
 		IO::print(out, "\t\t\t<meta-data android:name=\"android.app.lib_name\" android:value=\"%s\" />\n", native_lib->get_libname());
 		out.write("\t\t\t<intent-filter>\n");
 		out.write("\t\t\t\t<action android:name=\"android.intent.action.MAIN\" />\n");
@@ -56,9 +52,8 @@ void AndroidManifestGenerator::Worker::main()
 		out.write("\t\t</activity>\n");
 	}
 	out.write("\t</application>\n");
-	const set<string> &permissions = manifest.get_permissions();
-	for(set<string>::const_iterator i=permissions.begin(); i!=permissions.end(); ++i)
-		IO::print(out, "\t<uses-permission android:name=\"%s\" />\n", *i);
+	for(const string &p: manifest.get_permissions())
+		IO::print(out, "\t<uses-permission android:name=\"%s\" />\n", p);
 	out.write("</manifest>\n");
 
 	status = Task::SUCCESS;