nitc iOS: use ???? as bundle signature (now we can)

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

diff --git a/src/platform/android.nit b/src/platform/android.nit
index f001cd3..fb4b9bf 100644 (file)
--- a/src/platform/android.nit
+++ b/src/platform/android.nit
@@ -36,7 +36,7 @@ class AndroidPlatform
 
        redef fun name do return "android"
 
-       redef fun supports_libgc do return true
+       redef fun supports_libgc do return false
 
        redef fun supports_libunwind do return false
 
@@ -113,10 +113,22 @@ class AndroidToolchain
                end
 
                # Is there an icon?
+               var project_root = "."
+               var mpackage = compiler.mainmodule.first_real_mmodule.mpackage
+               if mpackage != null then
+                       var root = mpackage.root
+                       if root != null then
+                               var filepath = root.filepath
+                               if filepath != null then
+                                       project_root = filepath
+                               end
+                       end
+               end
+
                var resolutions = ["ldpi", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"]
                var icon_available = false
                for res in resolutions do
-                       var path = "res/drawable-{res}/icon.png"
+                       var path = project_root / "android/res/drawable-{res}/icon.png"
                        if path.file_exists then
                                icon_available = true
                                break
@@ -141,7 +153,7 @@ class AndroidToolchain
                ## Generate Application.mk
                dir = "{android_project_root}/jni/"
                """
-APP_ABI := armeabi armeabi-v7a x86 mips
+APP_ABI := armeabi armeabi-v7a x86
 APP_PLATFORM := android-{{{app_target_api}}}
 """.write_to_file "{dir}/Application.mk"
 
@@ -170,7 +182,7 @@ LOCAL_MODULE    := main
 LOCAL_SRC_FILES := \\
 {{{cfiles.join(" \\\n")}}}
 LOCAL_LDLIBS    := {{{ldflags.join(" ")}}} $(TARGET_ARCH)/libgc.a
-LOCAL_STATIC_LIBRARIES := android_native_app_glue png
+LOCAL_STATIC_LIBRARIES := android_native_app_glue
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -236,10 +248,6 @@ $(call import-module,android/native_app_glue)
                        exit 1
                end
                share_dir = share_dir.realpath
-               var target_png_dir = "{android_project_root}/jni/png"
-               if not target_png_dir.file_exists then
-                       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
@@ -259,18 +267,6 @@ $(call import-module,android/native_app_glue)
 
                # Copy assets, resources and libs where expected by the SDK
 
-               var project_root = "."
-               var mproject = compiler.mainmodule.first_real_mmodule.mproject
-               if mproject != null then
-                       var root = mproject.root
-                       if root != null then
-                               var filepath = root.filepath
-                               if filepath != null then
-                                       project_root = filepath / ".."
-                               end
-                       end
-               end
-
                # Link to assets (for mnit and others)
                var assets_dir = project_root / "assets"
                if assets_dir.file_exists then
@@ -282,7 +278,7 @@ $(call import-module,android/native_app_glue)
                end
 
                # Copy the res folder
-               var res_dir = project_root / "res"
+               var res_dir = project_root / "android/res"
                if res_dir.file_exists then
                        # copy the res folder to the compile dir
                        res_dir = res_dir.realpath
@@ -298,7 +294,7 @@ $(call import-module,android/native_app_glue)
                end
 
                # Copy the libs folder
-               var libs_dir = project_root / "libs"
+               var libs_dir = project_root / "android/libs"
                if libs_dir.file_exists then
                        toolcontext.exec_and_check(["cp", "-r", libs_dir, android_project_root], "Android project error")
                end
@@ -319,7 +315,7 @@ $(call import-module,android/native_app_glue)
                toolcontext.exec_and_check(["ndk-build", "-s", "-j", "-C", android_project_root], "Android project error")
 
                # Generate the apk
-               var args = ["ant", "-q", "-f", android_project_root+"/build.xml"]
+               var args = ["ant", "-f", android_project_root+"/build.xml"]
                if release then
                        args.add "release"
                else args.add "debug"
@@ -337,11 +333,16 @@ $(call import-module,android/native_app_glue)
                        var tsa_server= "TSA_SERVER".environ
 
                        if key_alias.is_empty then
-                               toolcontext.error(null,
-                                       "Error: the environment variable `KEY_ALIAS` must be set to use the `--release` option on Android projects.")
+                               toolcontext.warning(null, "key-alias",
+                                       "Warning: the environment variable `KEY_ALIAS` is not set, the APK file will not be signed.")
+
+                               # Just move the unsigned APK to outname
+                               args = ["mv", apk_path, outname]
+                               toolcontext.exec_and_check(args, "Android project error")
                                return
                        end
 
+                       # We have a key_alias, try to sign the APK
                        args = ["jarsigner", "-sigalg", "MD5withRSA", "-digestalg", "SHA1", apk_path, key_alias]
 
                        ## Use a custom keystore