X-Git-Url: http://nitlanguage.org

diff --git a/src/platform/android.nit b/src/platform/android.nit
index c04bd28..e87a6e4 100644
--- a/src/platform/android.nit
+++ b/src/platform/android.nit
@@ -42,7 +42,7 @@ class AndroidPlatform
 
 	redef fun supports_linker_script do return false
 
-	redef fun toolchain(toolcontext) do return new AndroidToolchain(toolcontext)
+	redef fun toolchain(toolcontext, compiler) do return new AndroidToolchain(toolcontext, compiler)
 end
 
 class AndroidToolchain
@@ -57,12 +57,12 @@ class AndroidToolchain
 		return "{android_project_root}/jni/nit_compile/"
 	end
 
-	redef fun default_outname(mainmodule) do return "{mainmodule.name}.apk"
+	redef fun default_outname do return "{super}.apk"
 
-	redef fun write_files(compiler, compile_dir, cfiles)
+	redef fun write_files(compile_dir, cfiles)
 	do
 		var android_project_root = android_project_root.as(not null)
-		var project = toolcontext.modelbuilder.android_project_for(compiler.mainmodule)
+		var project = new AndroidProject(toolcontext.modelbuilder, compiler.mainmodule)
 		var short_project_name = compiler.mainmodule.name.replace("-", "_")
 		var release = toolcontext.opt_release.value
 
@@ -70,7 +70,7 @@ class AndroidToolchain
 		if app_name == null then app_name = compiler.mainmodule.name
 		if not release then app_name += " Debug"
 
-		var app_package = project.java_package
+		var app_package = project.namespace
 		if app_package == null then app_package = "org.nitlanguage.{short_project_name}"
 		if not release then app_package += "_debug"
 
@@ -107,7 +107,7 @@ class AndroidToolchain
 		if not dir.file_exists then dir.mkdir
 
 		# compile normal C files
-		super(compiler, compile_dir, cfiles)
+		super
 
 		# Gather extra C files generated elsewhere than in super
 		for f in compiler.extern_bodies do
@@ -181,14 +181,15 @@ $(call import-module,android/native_app_glue)
 
 		### generate AndroidManifest.xml
 		dir = android_project_root
-		"""<?xml version="1.0" encoding="utf-8"?>
+		var manifest_file = new FileWriter.open("{dir}/AndroidManifest.xml")
+		manifest_file.write """
+<?xml version="1.0" encoding="utf-8"?>
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="{{{app_package}}}"
         android:versionCode="{{{project.version_code}}}"
         android:versionName="{{{app_version}}}">
 
-    <!-- This is the platform API where NativeActivity was introduced. -->
     <uses-sdk
         android:minSdkVersion="{{{app_min_api}}}"
         android:targetSdkVersion="{{{app_target_api}}}"
@@ -200,22 +201,23 @@ $(call import-module,android/native_app_glue)
 		android:debuggable="{{{not release}}}"
 		{{{icon_declaration}}}
 		android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation">
+"""
 
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
-        <activity android:name="android.app.NativeActivity"
+		for activity in project.activities do
+			manifest_file.write """
+        <activity android:name="{{{activity}}}"
                 android:label="@string/app_name"
                 {{{project.manifest_activity_attributes.join("\n")}}}
                 {{{icon_declaration}}}>
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name=\"android.app.lib_name\"
-                    android:value=\"main\" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+"""
+		end
 
+		manifest_file.write """
 {{{project.manifest_application_lines.join("\n")}}}
 
     </application>
@@ -224,7 +226,8 @@ $(call import-module,android/native_app_glue)
 
 </manifest>
 <!-- END_INCLUDE(manifest) -->
-		""".write_to_file("{dir}/AndroidManifest.xml")
+"""
+		manifest_file.close
 
 		### Link to png sources
 		# libpng is not available on Android NDK
@@ -308,12 +311,12 @@ $(call import-module,android/native_app_glue)
 		end
 	end
 
-	redef fun write_makefile(compiler, compile_dir, cfiles)
+	redef fun write_makefile(compile_dir, cfiles)
 	do
 		# Do nothing, already done in `write_files`
 	end
 
-	redef fun compile_c_code(compiler, compile_dir)
+	redef fun compile_c_code(compile_dir)
 	do
 		var android_project_root = android_project_root.as(not null)
 		var short_project_name = compiler.mainmodule.name.replace("-", "_")