Merge: Use linker symbols to encode colors

[nit.git] / src / compiler / android_platform.nit

diff --git a/src/compiler/android_platform.nit b/src/compiler/android_platform.nit
index e1e5c43..b7069e3 100644 (file)
--- a/src/compiler/android_platform.nit
+++ b/src/compiler/android_platform.nit
@@ -36,6 +36,8 @@ class AndroidPlatform
 
        redef fun supports_libunwind do return false
 
+       redef fun supports_linker_script do return false
+
        redef fun toolchain(toolcontext) do return new AndroidToolchain(toolcontext)
 end
 
@@ -174,15 +176,13 @@ $(call import-module,android/native_app_glue)
     <application
                android:label="@string/app_name"
                android:hasCode="true"
-               android:debuggable="{{{not release}}}">
+               android:debuggable="{{{not release}}}"
+               {{{icon_declaration}}}>
 
         <!-- Our activity is the built-in NativeActivity framework class.
              This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                 android:label="@string/app_name"
-                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                android:configChanges="orientation|keyboardHidden"
-                android:screenOrientation="portrait"
                 {{{project.manifest_activity_attributes.join("\n")}}}
                 {{{icon_declaration}}}>
             <!-- Tell NativeActivity the name of our .so -->
@@ -237,21 +237,22 @@ $(call import-module,android/native_app_glue)
                        end
                end
 
-               ### copy resources  (for android)
-               # This will be accessed from `android_project_root`
-               var res_dir
+               ### Copy resources and libs where expected by the SDK
+               var project_root
                if compiler.mainmodule.location.file != null then
                        # it is a real file, use "{file}/../res"
-                       res_dir = "{compiler.mainmodule.location.file.filename.dirname}/../res"
+                       project_root = "{compiler.mainmodule.location.file.filename.dirname}/.."
                else
                        # probably used -m, use "."
-                       res_dir = "res"
+                       project_root = "."
                end
+
+               # Android resources folder
+               var res_dir = project_root / "res"
                if res_dir.file_exists then
                        # copy the res folder to .nit_compile
                        res_dir = res_dir.realpath
-                       var target_res_dir = "{android_project_root}"
-                       toolcontext.exec_and_check(["cp", "-R", res_dir, target_res_dir], "Android project error")
+                       toolcontext.exec_and_check(["cp", "-R", res_dir, android_project_root], "Android project error")
                end
 
                if not res_dir.file_exists or not "{res_dir}/values/strings.xml".file_exists then
@@ -261,6 +262,12 @@ $(call import-module,android/native_app_glue)
     <string name="app_name">{{{app_name}}}</string>
 </resources>""".write_to_file "{dir}/res/values/strings.xml"
                end
+
+               # Android libs folder
+               var libs_dir = project_root / "libs"
+               if libs_dir.file_exists then
+                       toolcontext.exec_and_check(["cp", "-r", libs_dir, android_project_root], "Android project error")
+               end
        end
 
        redef fun write_makefile(compiler, compile_dir, cfiles)
@@ -286,12 +293,40 @@ $(call import-module,android/native_app_glue)
                # Move the apk to the target
                var outname = outfile(compiler.mainmodule)
 
-               var src_apk_suffix
                if release then
-                       src_apk_suffix = "release-unsigned"
-               else src_apk_suffix = "debug"
+                       var apk_path = "{android_project_root}/bin/{compiler.mainmodule.name}-release-unsigned.apk"
+
+                       # Sign APK
+                       var keystore_path= "KEYSTORE".environ
+                       var key_alias= "KEY_ALIAS".environ
+                       var tsa_server= "TSA_SERVER".environ
+
+                       if key_alias.is_empty then
+                               toolcontext.fatal_error(null,
+                                       "Fatal Error: the environment variable `KEY_ALIAS` must be set to use the `--release` option on Android projects.")
+                       end
 
-               toolcontext.exec_and_check(["mv", "{android_project_root}/bin/{compiler.mainmodule.name}-{src_apk_suffix}.apk", outname], "Android project error")
+                       args = ["jarsigner", "-sigalg", "MD5withRSA", "-digestalg", "SHA1", apk_path, key_alias]
+
+                       ## Use a custom keystore
+                       if not keystore_path.is_empty then args.add_all(["-keystore", keystore_path])
+
+                       ## Use a TSA server
+                       if not tsa_server.is_empty then args.add_all(["-tsa", tsa_server])
+
+                       toolcontext.exec_and_check(args, "Android project error")
+
+                       # Clean output file
+                       if outname.to_path.exists then outname.to_path.delete
+
+                       # Align APK
+                       args = ["zipalign", "4", apk_path, outname]
+                       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]
+                       toolcontext.exec_and_check(args, "Android project error")
+               end
        end
 end