Merge: Android support improvements

Pull-Request: #1123
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Jean Privat <jean@pryen.org>

diff --combined src/platform/android.nit
index 78ba820,db28b7f..ffd90bc
--- 1/src/platform/android.nit
--- 2/src/platform/android.nit
+++ b/src/platform/android.nit
@@@ -34,8 -34,6 +34,8 @@@ en
  class AndroidPlatform
        super Platform
  
 +      redef fun supports_libgc do return true
 +
        redef fun supports_libunwind do return false
  
        redef fun supports_linker_script do return false
@@@ -61,14 -59,16 +61,16 @@@ class AndroidToolchai
        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
                if app_name == null then app_name = compiler.mainmodule.name
+               if not release then app_name += " Debug"
  
                var app_package = project.java_package
                if app_package == null then app_package = "org.nitlanguage.{short_project_name}"
+               if not release then app_package += "_debug"
  
                var app_version = project.version
                if app_version == null then app_version = "1.0"
@@@ -148,11 -148,11 +150,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    := -llog -landroid -lEGL -lGLESv1_CM -lz libgc.a
  LOCAL_STATIC_LIBRARIES := android_native_app_glue png
  
  include $(BUILD_SHARED_LIBRARY)
@@@ -179,7 -179,8 +181,8 @@@ $(call import-module,android/native_app
                android:label="@string/app_name"
                android:hasCode="true"
                android:debuggable="{{{not release}}}"
-               {{{icon_declaration}}}>
+               {{{icon_declaration}}}
+               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation">
  
          <!-- Our activity is the built-in NativeActivity framework class.
               This will take care of integrating with our NDK code. -->
@@@ -221,15 -222,6 +224,15 @@@
                        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/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")
 +
                ### Link to assets (for mnit and others)
                # This will be accessed from `android_project_root`
                var assets_dir
@@@ -289,6 -281,7 +292,7 @@@
        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)
@@@ -305,7 -298,7 +309,7 @@@
                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
@@@ -335,7 -328,7 +339,7 @@@
                        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