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

diff --git a/src/platform/android.nit b/src/platform/android.nit
index b411225..404d780 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,25 +57,23 @@ 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 short_project_name = compiler.mainmodule.name.replace("-", "_")
+		var project = new AndroidProject(toolcontext.modelbuilder, compiler.mainmodule)
 		var release = toolcontext.opt_release.value
 
 		var app_name = project.name
-		if app_name == null then app_name = compiler.mainmodule.name
 		if not release then app_name += " Debug"
 
-		var app_package = project.java_package
-		if app_package == null then app_package = "org.nitlanguage.{short_project_name}"
+		var short_project_name = project.short_name
+
+		var app_package = project.namespace
 		if not release then app_package += "_debug"
 
 		var app_version = project.version
-		if app_version == null then app_version = "1.0"
 
 		var app_min_api = project.min_api
 		if app_min_api == null then app_min_api = 10
@@ -107,7 +105,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
@@ -227,6 +225,7 @@ $(call import-module,android/native_app_glue)
 </manifest>
 <!-- END_INCLUDE(manifest) -->
 """
+		manifest_file.close
 
 		### Link to png sources
 		# libpng is not available on Android NDK
@@ -310,12 +309,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("-", "_")