From 14e3d2934657c9a837f9dd8faf76a464033350f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Fri, 26 Dec 2014 15:01:48 -0500 Subject: [PATCH] android: copy user libs folder to the android project MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- src/compiler/android_platform.nit | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/compiler/android_platform.nit b/src/compiler/android_platform.nit index 1cf6ba8..5d6d312 100644 --- a/src/compiler/android_platform.nit +++ b/src/compiler/android_platform.nit @@ -234,21 +234,22 @@ $(call import-module,android/native_app_glue) end end - ### copy resources (for android) - # This will be accessed from `android_project_root` - var res_dir + ### Copy resources and libs where expected by the SDK + var project_root if compiler.mainmodule.location.file != null then # it is a real file, use "{file}/../res" - res_dir = "{compiler.mainmodule.location.file.filename.dirname}/../res" + project_root = "{compiler.mainmodule.location.file.filename.dirname}/.." else # probably used -m, use "." - res_dir = "res" + project_root = "." end + + # Android resources folder + var res_dir = project_root / "res" if res_dir.file_exists then # copy the res folder to .nit_compile res_dir = res_dir.realpath - var target_res_dir = "{android_project_root}" - toolcontext.exec_and_check(["cp", "-R", res_dir, target_res_dir], "Android project error") + toolcontext.exec_and_check(["cp", "-R", res_dir, android_project_root], "Android project error") end if not res_dir.file_exists or not "{res_dir}/values/strings.xml".file_exists then @@ -258,6 +259,12 @@ $(call import-module,android/native_app_glue) {{{app_name}}} """.write_to_file "{dir}/res/values/strings.xml" end + + # Android libs folder + var libs_dir = project_root / "libs" + if libs_dir.file_exists then + toolcontext.exec_and_check(["cp", "-r", libs_dir, android_project_root], "Android project error") + end end redef fun write_makefile(compiler, compile_dir, cfiles) -- 1.7.9.5