Mono: Android build and shared libraries fixes

Fix location of Mono's shared libraries.
Fix build failing if the directory 'platform/android/java/libs/{target}/{abi}' doesn't exist.

3 files changed, 96 insertions, 15 deletions

diff --git a/modules/mono/build_scripts/make_android_mono_config.py b/modules/mono/build_scripts/make_android_mono_config.py
new file mode 100644
index 0000000000..cd9210897d
--- /dev/null
+++ b/modules/mono/build_scripts/make_android_mono_config.py
@@ -0,0 +1,69 @@
+
+def generate_compressed_config(config_src, output_dir):
+    import os.path
+    from compat import byte_to_str
+
+    # Header file
+    with open(os.path.join(output_dir, 'android_mono_config.gen.h'), 'w') as header:
+        header.write('''/* THIS FILE IS GENERATED DO NOT EDIT */
+#ifndef ANDROID_MONO_CONFIG_GEN_H
+#define ANDROID_MONO_CONFIG_GEN_H
+
+#ifdef ANDROID_ENABLED
+
+#include "core/ustring.h"
+
+String get_godot_android_mono_config();
+
+#endif // ANDROID_ENABLED
+
+#endif // ANDROID_MONO_CONFIG_GEN_H
+''')
+
+    # Source file
+    with open(os.path.join(output_dir, 'android_mono_config.gen.cpp'), 'w') as cpp:
+        with open(config_src, 'rb') as f:
+            buf = f.read()
+            decompr_size = len(buf)
+            import zlib
+            buf = zlib.compress(buf)
+            compr_size = len(buf)
+
+            bytes_seq_str = ''
+            for i, buf_idx in enumerate(range(compr_size)):
+                if i > 0:
+                    bytes_seq_str += ', '
+                bytes_seq_str += byte_to_str(buf[buf_idx])
+
+            cpp.write('''/* THIS FILE IS GENERATED DO NOT EDIT */
+#include "android_mono_config.gen.h"
+
+#ifdef ANDROID_ENABLED
+
+#include "core/io/compression.h"
+#include "core/pool_vector.h"
+
+namespace {
+
+// config
+static const int config_compressed_size = %d;
+static const int config_uncompressed_size = %d;
+static const unsigned char config_compressed_data[] = { %s };
+
+} // namespace
+
+String get_godot_android_mono_config() {
+	PoolVector<uint8_t> data;
+	data.resize(config_uncompressed_size);
+	PoolVector<uint8_t>::Write w = data.write();
+	Compression::decompress(w.ptr(), config_uncompressed_size, config_compressed_data,
+			config_compressed_size, Compression::MODE_DEFLATE);
+	String s;
+	if (s.parse_utf8((const char *)w.ptr(), data.size())) {
+		ERR_FAIL_V(String());
+	}
+	return s;
+}
+
+#endif // ANDROID_ENABLED
+''' % (compr_size, decompr_size, bytes_seq_str))
diff --git a/modules/mono/build_scripts/make_cs_compressed_header.py b/modules/mono/build_scripts/make_cs_compressed_header.py
index 1f9177cef8..ed49db5bb2 100644
--- a/modules/mono/build_scripts/make_cs_compressed_header.py
+++ b/modules/mono/build_scripts/make_cs_compressed_header.py
@@ -23,30 +23,31 @@ def generate_header(src, dst, version_dst):
                 latest_mtime = mtime if mtime > latest_mtime else latest_mtime
                 with open(filepath, 'rb') as f:
                     buf = f.read()
-                    decomp_size = len(buf)
+                    decompr_size = len(buf)
                     import zlib
                     buf = zlib.compress(buf)
+                    compr_size = len(buf)
                     name = str(cs_file_count)
                     header.write('\n')
                     header.write('// ' + filepath_src_rel + '\n')
-                    header.write('static const int _cs_' + name + '_compressed_size = ' + str(len(buf)) + ';\n')
-                    header.write('static const int _cs_' + name + '_uncompressed_size = ' + str(decomp_size) + ';\n')
+                    header.write('static const int _cs_' + name + '_compressed_size = ' + str(compr_size) + ';\n')
+                    header.write('static const int _cs_' + name + '_uncompressed_size = ' + str(decompr_size) + ';\n')
                     header.write('static const unsigned char _cs_' + name + '_compressed[] = { ')
-                    for i, buf_idx in enumerate(range(len(buf))):
+                    for i, buf_idx in enumerate(range(compr_size)):
                         if i > 0:
                             header.write(', ')
                         header.write(byte_to_str(buf[buf_idx]))
+                    header.write(' };\n')
                     inserted_files += '\tr_files.insert("' + filepath_src_rel.replace('\\', '\\\\') + '", ' \
-                                        'CompressedFile(_cs_' + name + '_compressed_size, ' \
+                                        'GodotCsCompressedFile(_cs_' + name + '_compressed_size, ' \
                                         '_cs_' + name + '_uncompressed_size, ' \
                                         '_cs_' + name + '_compressed));\n'
-                    header.write(' };\n')
-        header.write('\nstruct CompressedFile\n' '{\n'
+        header.write('\nstruct GodotCsCompressedFile\n' '{\n'
             '\tint compressed_size;\n' '\tint uncompressed_size;\n' '\tconst unsigned char* data;\n'
-            '\n\tCompressedFile(int p_comp_size, int p_uncomp_size, const unsigned char* p_data)\n'
+            '\n\tGodotCsCompressedFile(int p_comp_size, int p_uncomp_size, const unsigned char* p_data)\n'
             '\t{\n' '\t\tcompressed_size = p_comp_size;\n' '\t\tuncompressed_size = p_uncomp_size;\n'
-            '\t\tdata = p_data;\n' '\t}\n' '\n\tCompressedFile() {}\n' '};\n'
-            '\nvoid get_compressed_files(Map<String, CompressedFile>& r_files)\n' '{\n' + inserted_files + '}\n'
+            '\t\tdata = p_data;\n' '\t}\n' '\n\tGodotCsCompressedFile() {}\n' '};\n'
+            '\nvoid get_compressed_files(Map<String, GodotCsCompressedFile>& r_files)\n' '{\n' + inserted_files + '}\n'
             )
         header.write('\n#endif // TOOLS_ENABLED\n')
         header.write('\n#endif // CS_COMPRESSED_H\n')
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py
index c549640d61..424df25bd5 100644
--- a/modules/mono/build_scripts/mono_configure.py
+++ b/modules/mono/build_scripts/mono_configure.py
@@ -41,7 +41,7 @@ def copy_file(src_dir, dst_dir, name):
     dst_dir = Dir(dst_dir).abspath
 
     if not os.path.isdir(dst_dir):
-        os.mkdir(dst_dir)
+        os.makedirs(dst_dir)
 
     copy(src_path, dst_dir)
 
@@ -65,6 +65,10 @@ def configure(env, env_mono):
         # TODO: Implement this. We have to add the data directory to the apk, concretely the Api and Tools folders.
         raise RuntimeError('This module does not currently support building for android with tools enabled')
 
+    if is_android and mono_static:
+        # When static linking and doing something that requires libmono-native, we get a dlopen error as libmono-native seems to depend on libmonosgen-2.0
+        raise RuntimeError('Linking Mono statically is not currently supported on Android')
+
     if (os.getenv('MONO32_PREFIX') or os.getenv('MONO64_PREFIX')) and not mono_prefix:
         print("WARNING: The environment variables 'MONO32_PREFIX' and 'MONO64_PREFIX' are deprecated; use the 'mono_prefix' SCons parameter instead")
 
@@ -188,7 +192,7 @@ def configure(env, env_mono):
             if is_apple:
                 env.Append(LIBS=['iconv', 'pthread'])
             elif is_android:
-                env.Append(LIBS=['m', 'dl'])
+                pass # Nothing
             else:
                 env.Append(LIBS=['m', 'rt', 'dl', 'pthread'])
 
@@ -236,6 +240,14 @@ def configure(env, env_mono):
             mono_root = subprocess.check_output(['pkg-config', 'mono-2', '--variable=prefix']).decode('utf8').strip()
 
         make_template_dir(env, mono_root)
+    elif not tools_enabled and is_android:
+        # Compress Android Mono Config
+        from . import make_android_mono_config
+        config_file_path = os.path.join(mono_root, 'etc', 'mono', 'config')
+        make_android_mono_config.generate_compressed_config(config_file_path, 'mono_gd/')
+
+        # Copy the required shared libraries
+        copy_mono_shared_libs(env, mono_root, None)
 
     if copy_mono_root:
         if not mono_root:
@@ -270,9 +282,8 @@ def make_template_dir(env, mono_root):
 
     # Copy etc/mono/
 
-    if platform != 'android':
-        template_mono_config_dir = os.path.join(template_mono_root_dir, 'etc', 'mono')
-        copy_mono_etc_dir(mono_root, template_mono_config_dir, env['platform'])
+    template_mono_config_dir = os.path.join(template_mono_root_dir, 'etc', 'mono')
+    copy_mono_etc_dir(mono_root, template_mono_config_dir, env['platform'])
 
     # Copy the required shared libraries