From 06c229393c09d2a94acac46e3d649b4b21ba1913 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sun, 2 Mar 2014 07:05:34 -0500 Subject: [PATCH] nitg/android: add a deeper folder to generated project MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- src/android_platform.nit | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/android_platform.nit b/src/android_platform.nit index 60d4ca0..c204651 100644 --- a/src/android_platform.nit +++ b/src/android_platform.nit @@ -67,7 +67,7 @@ class AndroidToolchain do var normal_compile_dir = super android_project_root = normal_compile_dir - return "{normal_compile_dir}/jni/" + return "{normal_compile_dir}/jni/nit_compile/" end redef fun write_files(compiler, compile_dir, cfiles) @@ -85,6 +85,9 @@ class AndroidToolchain var dir = "{android_project_root}/jni/" if not dir.file_exists then dir.mkdir + dir = compile_dir + if not dir.file_exists then dir.mkdir + # compile normal C files super(compiler, compile_dir, cfiles) @@ -93,10 +96,18 @@ class AndroidToolchain if f isa ExternCFile then cfiles.add(f.filename.basename("")) end - ### generate makefile into "{compile_dir}/Android.mk" - if not dir.file_exists then dir.mkdir + ## Generate delagating makefile + dir = "{android_project_root}/jni/" var file = new OFStream.open("{dir}/Android.mk") file.write """ +include $(call all-subdir-makefiles) +""" + file.close + + ### generate makefile into "{compile_dir}/Android.mk" + dir = compile_dir + file = new OFStream.open("{dir}/Android.mk") + file.write """ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -- 1.7.9.5