From ffe9cb4b9c89d6b3cb0950aa6cb4723135fcd703 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Fri, 23 Jan 2015 11:57:41 -0500 Subject: [PATCH] nitc/android: support using -m with Android compilation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- src/platform/android.nit | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/platform/android.nit b/src/platform/android.nit index 6ba5502..dbc0058 100644 --- a/src/platform/android.nit +++ b/src/platform/android.nit @@ -59,7 +59,7 @@ class AndroidToolchain 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 + var short_project_name = compiler.mainmodule.name.replace("-", "_") var release = toolcontext.opt_release.value var app_name = project.name @@ -278,6 +278,7 @@ $(call import-module,android/native_app_glue) redef fun compile_c_code(compiler, compile_dir) do var android_project_root = android_project_root.as(not null) + var short_project_name = compiler.mainmodule.name.replace("-", "_") var release = toolcontext.opt_release.value # Compile C code (and thus Nit) @@ -294,7 +295,7 @@ $(call import-module,android/native_app_glue) var outname = outfile(compiler.mainmodule) if release then - var apk_path = "{android_project_root}/bin/{compiler.mainmodule.name}-release-unsigned.apk" + var apk_path = "{android_project_root}/bin/{short_project_name}-release-unsigned.apk" # Sign APK var keystore_path= "KEYSTORE".environ @@ -324,7 +325,7 @@ $(call import-module,android/native_app_glue) toolcontext.exec_and_check(args, "Android project error") else # Move to the expected output path - args = ["mv", "{android_project_root}/bin/{compiler.mainmodule.name}-debug.apk", outname] + args = ["mv", "{android_project_root}/bin/{short_project_name}-debug.apk", outname] toolcontext.exec_and_check(args, "Android project error") end end -- 1.7.9.5