lib: intro `Float.lerp` for simple linear interpolation

[nit.git] / src / platform / android.nit

diff --git a/src/platform/android.nit b/src/platform/android.nit
index db28b7f..c04bd28 100644 (file)
--- a/src/platform/android.nit
+++ b/src/platform/android.nit
@@ -34,6 +34,10 @@ end
 class AndroidPlatform
        super Platform
 
+       redef fun name do return "android"
+
+       redef fun supports_libgc do return true
+
        redef fun supports_libunwind do return false
 
        redef fun supports_linker_script do return false
@@ -136,11 +140,26 @@ class AndroidToolchain
                        end
                end
 
-               ## Generate delagating 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]
+               var platform_name = "android"
+               for mmodule in compiler.mainmodule.in_importation.greaters do
+                       if mmodule.ldflags.keys.has(platform_name) then
+                               ldflags.add_all mmodule.ldflags[platform_name]
+                       end
+               end
 
                ### generate makefile into "{compile_dir}/Android.mk"
                dir = compile_dir
@@ -148,11 +167,11 @@ include $(call all-subdir-makefiles)
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS   := -D ANDROID
+LOCAL_CFLAGS   := -D ANDROID -D WITH_LIBGC
 LOCAL_MODULE    := main
 LOCAL_SRC_FILES := \\
 {{{cfiles.join(" \\\n")}}}
-LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv1_CM -lz
+LOCAL_LDLIBS    := {{{ldflags.join(" ")}}} $(TARGET_ARCH)/libgc.a
 LOCAL_STATIC_LIBRARIES := android_native_app_glue png
 
 include $(BUILD_SHARED_LIBRARY)
@@ -222,6 +241,22 @@ $(call import-module,android/native_app_glue)
                        toolcontext.exec_and_check(["ln", "-s", "{share_dir}/png/", target_png_dir], "Android project error")
                end
 
+               # Ensure that android-setup-libgc.sh has been executed
+               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
+               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`
                var assets_dir
@@ -263,7 +298,7 @@ $(call import-module,android/native_app_glue)
 """<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">{{{app_name}}}</string>
-</resources>""".write_to_file "{dir}/res/values/strings.xml"
+</resources>""".write_to_file "{android_project_root}/res/values/strings.xml"
                end
 
                # Android libs folder