X-Git-Url: http://nitlanguage.org
diff --git a/src/platform/android.nit b/src/platform/android.nit
index f4b04a6..e2db002 100644
--- a/src/platform/android.nit
+++ b/src/platform/android.nit
@@ -140,11 +140,17 @@ class AndroidToolchain
end
end
- ## Generate delegating makefile
+ ## Generate Application.mk
dir = "{android_project_root}/jni/"
"""
+APP_ABI := armeabi armeabi-v7a x86 mips
+APP_PLATFORM := android-{{{app_target_api}}}
+""".write_to_file "{dir}/Application.mk"
+
+ ## Generate delegating makefile
+ """
include $(call all-subdir-makefiles)
- """.write_to_file("{dir}/Android.mk")
+""".write_to_file "{dir}/Android.mk"
# Gather ldflags for Android
var ldflags = new Array[String]
@@ -165,7 +171,7 @@ LOCAL_CFLAGS := -D ANDROID -D WITH_LIBGC
LOCAL_MODULE := main
LOCAL_SRC_FILES := \\
{{{cfiles.join(" \\\n")}}}
-LOCAL_LDLIBS := {{{ldflags.join(" ")}}} libgc.a
+LOCAL_LDLIBS := {{{ldflags.join(" ")}}} $(TARGET_ARCH)/libgc.a
LOCAL_STATIC_LIBRARIES := android_native_app_glue png
include $(BUILD_SHARED_LIBRARY)
@@ -175,14 +181,15 @@ $(call import-module,android/native_app_glue)
### generate AndroidManifest.xml
dir = android_project_root
- """
+ var manifest_file = new FileWriter.open("{dir}/AndroidManifest.xml")
+ manifest_file.write """
+
-
+"""
-
-
-
-
+"""
+ end
+ manifest_file.write """
{{{project.manifest_application_lines.join("\n")}}}
@@ -218,7 +226,8 @@ $(call import-module,android/native_app_glue)
- """.write_to_file("{dir}/AndroidManifest.xml")
+"""
+ manifest_file.close
### Link to png sources
# libpng is not available on Android NDK
@@ -236,13 +245,20 @@ $(call import-module,android/native_app_glue)
end
# Ensure that android-setup-libgc.sh has been executed
- if not "{share_dir}/libgc/lib".file_exists then
+ if not "{share_dir}/libgc/arm/lib".file_exists then
toolcontext.exec_and_check(["{share_dir}/libgc/android-setup-libgc.sh"], "Android project error")
end
# Copy GC files
- toolcontext.exec_and_check(["cp", "{share_dir}/libgc/lib/libgc.a", "{android_project_root}/libgc.a"], "Android project error")
- toolcontext.exec_and_check(["ln", "-s", "{share_dir}/libgc/include/gc/", "{android_project_root}/jni/nit_compile/gc"], "Android project error")
+ for arch in ["arm", "x86", "mips"] do
+ dir = android_project_root/arch
+ dir.mkdir
+ toolcontext.exec_and_check(["cp", "{share_dir}/libgc/{arch}/lib/libgc.a",
+ dir/"libgc.a"], "Android project error")
+ end
+
+ toolcontext.exec_and_check(["ln", "-s", "{share_dir}/libgc/arm/include/gc/",
+ "{android_project_root}/jni/nit_compile/gc"], "Android project error")
### Link to assets (for mnit and others)
# This will be accessed from `android_project_root`
@@ -285,7 +301,7 @@ $(call import-module,android/native_app_glue)
"""
{{{app_name}}}
-""".write_to_file "{dir}/res/values/strings.xml"
+""".write_to_file "{android_project_root}/res/values/strings.xml"
end
# Android libs folder