wip ndk r23

Android: Bump min SDK to 19, target SDK to 30

.github/workflows/build.yml

@@ -27,15 +27,16 @@ on:
 
 env:
   # Use SHA or tag instead of the branch for caching purposes.
-  MONO_TAG: mono-6.12.0.122
-  PYTHON_VERSION: 3.8
+  MONO_TAG: mono-6.12.0.147
+  PYTHON_VERSION: 3.9
   # Should match the version that Mono supports.
   EMSDK_VERSION: 1.39.9
   ANDROID_CMAKE_VERSION: 3.10.2.4988404
   # These should be synced with the Godot repo.
   # platform/android/java/app/config.gradle
-  ANDROID_PLATFORM: android-29
-  ANDROID_API: 18
+  ANDROID_PLATFORM: android-30
+  ANDROID_API: 19
+  ANDROID_NDK_VERSION: 21.4.7075529
   # platform/iphone/detect.py
   IOS_VERSION_MIN: 10.0
 
@@ -64,7 +65,7 @@ jobs:
           sudo apt-get -y install git autoconf libtool libtool-bin automake build-essential gettext cmake python3 curl
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -83,7 +84,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono
@@ -138,7 +139,7 @@ jobs:
           sudo apt-get -y install mingw-w64 libz-mingw-w64-dev
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -157,7 +158,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono
@@ -202,7 +203,7 @@ jobs:
           brew install autoconf automake libtool pkg-config cmake python3
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -221,7 +222,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono
@@ -256,7 +257,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        target: [arm64, x86_64]
+        target: [arm64, x86_64, arm64-sim]
     steps:
       - name: Set Environment Variables
         run: |
@@ -266,7 +267,7 @@ jobs:
           brew install autoconf automake libtool pkg-config cmake python3
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -285,7 +286,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono
@@ -336,7 +337,7 @@ jobs:
           brew install autoconf automake libtool pkg-config cmake python3
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -355,7 +356,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono
@@ -428,13 +429,13 @@ jobs:
         run: |
           sudo snap install androidsdk
           androidsdk "platforms;${ANDROID_PLATFORM}"
-          androidsdk "ndk-bundle"
+          androidsdk "ndk;${ANDROID_NDK_VERSION}"
           androidsdk "cmake;${ANDROID_CMAKE_VERSION}"
           echo "ANDROID_SDK_ROOT=$HOME/snap/androidsdk/current/" >> $GITHUB_ENV
-          echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk-bundle" >> $GITHUB_ENV
+          echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION" >> $GITHUB_ENV
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -453,7 +454,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono
@@ -557,14 +558,13 @@ jobs:
         run: |
           sudo apt-get -y install snapd
           sudo snap install androidsdk
-          androidsdk "platforms;${ANDROID_PLATFORM}"
-          androidsdk "ndk-bundle"
+          androidsdk "ndk;${ANDROID_NDK_VERSION}"
           androidsdk "cmake;${ANDROID_CMAKE_VERSION}"
           echo "ANDROID_SDK_ROOT=$HOME/snap/androidsdk/current/" >> $GITHUB_ENV
-          echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk-bundle" >> $GITHUB_ENV
+          echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION" >> $GITHUB_ENV
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -583,7 +583,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Download LLVM artifact
@@ -651,7 +651,7 @@ jobs:
           sudo apt-get -y install git autoconf libtool libtool-bin automake build-essential gettext cmake python3 curl
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -670,11 +670,11 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Setup Emscripten SDK
-        uses: mymindstorm/setup-emsdk@v8
+        uses: mymindstorm/setup-emsdk@v10
         with:
           version: ${{ env.EMSDK_VERSION }}
       - name: Patch Mono
@@ -724,7 +724,7 @@ jobs:
     steps:
       - name: Cache LLVM
         id: cache_llvm
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ~/mono-installs/llvm-${{ matrix.target }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-llvm-${{ matrix.target }}
@@ -747,7 +747,7 @@ jobs:
       - name: Cache Mono Sources
         if: steps.cache_llvm.outputs.cache-hit != 'true'
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -769,7 +769,7 @@ jobs:
           path: godot-mono-builds
       - name: Setup Python
         if: steps.cache_llvm.outputs.cache-hit != 'true'
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono
@@ -811,7 +811,7 @@ jobs:
           sudo apt-get -y install git autoconf libtool libtool-bin automake build-essential gettext cmake python3 curl
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -830,7 +830,7 @@ jobs:
         with:
           path: godot-mono-builds
       - name: Setup Python
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Patch Mono

.gitignore

@@ -1,2 +1,3 @@
 __pycache__/
 *.pyc
+.DS_Store

README.md

@@ -9,9 +9,9 @@ This repository contains scripts for building the Mono runtime to use with Godot
 The scripts are tested against specific versions of the toolchains used by Godot.
 While they may work with other versions, you might have issues applying patches or compiling, so we recommend using the versions below.
 
-- Mono: 6.12.0.122.
+- Mono: 6.12.0.147.
 - Emscripten: 1.39.9.
-- Android: API level 29.
+- Android: API level 30.
 
 ## Command-line options
 
@@ -36,7 +36,7 @@ export MONO_SOURCE_ROOT=$HOME/git/mono
 
 ### Notes
 - Python 3.7 or higher is required.
-- OSXCROSS is supported expect for building the Mono cross-compilers.
+- OSXCROSS is supported except for building the Mono cross-compilers.
 - Building on Windows is not supported. It's possible to use Cygwin or WSL (Windows Subsystem for Linux) but this hasn't been tested.
 
 ## Compiling Godot for Desktop with this Runtime
@@ -75,7 +75,7 @@ _AOT cross-compilers for desktop platforms cannot be built with these scripts ye
 ```bash
 # These are the default values. This step can be omitted if SDK and NDK root are in this location.
 export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk-bundle
+export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$NDK_VERSION
 
 # Build the runtime for all supported Android ABIs.
 ./android.py configure --target=all-runtime

android.py

@@ -104,50 +104,40 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
     if target in extra_target_envs:
         env.update(extra_target_envs[target])
 
-    android_new_ndk = True
-
-    with open(path_join(opts.android_ndk_root, 'source.properties')) as file:
-        for line in file:
-            line = line.strip()
-            if line.startswith('Pkg.Revision ') or line.startswith('Pkg.Revision='):
-                pkg_revision = line.split('=')[1].strip()
-                mayor = int(pkg_revision.split('.')[0])
-                android_new_ndk = mayor >= 18
-                break
-
     arch = AndroidTargetTable.archs[target]
     abi_name = AndroidTargetTable.abi_names[target]
     host_triple = AndroidTargetTable.host_triples[target]
-    api = env['ANDROID_API_VERSION']
+    api: str = env['ANDROID_API_VERSION']
 
-    toolchain_path = path_join(opts.android_toolchains_prefix, opts.toolchain_name_fmt % (target, api))
+    toolchain_path = path_join(opts.android_ndk_root, 'toolchains/llvm/prebuilt/linux-x86_64')
 
     tools_path = path_join(toolchain_path, 'bin')
-    name_fmt = abi_name + '-%s'
+    name_fmt_with_api = ('armv7a-linux-androideabi' if target == 'armeabi-v7a' else abi_name) + api + '-%s'
+    name_fmt_no_api = abi_name + '-%s'
 
     sdk_cmake_dir = path_join(opts.android_sdk_root, 'cmake', get_android_cmake_version(opts))
     if not os.path.isdir(sdk_cmake_dir):
         print('Android CMake directory \'%s\' not found' % sdk_cmake_dir)
 
-    AR = path_join(tools_path, name_fmt % 'ar')
-    AS = path_join(tools_path, name_fmt % 'as')
-    CC = path_join(tools_path, name_fmt % 'clang')
-    CXX = path_join(tools_path, name_fmt % 'clang++')
+    AR = path_join(tools_path, 'llvm-ar')
+    AS = path_join(tools_path, name_fmt_no_api % 'as')
+    CC = path_join(tools_path, name_fmt_with_api % 'clang')
+    CXX = path_join(tools_path, name_fmt_with_api % 'clang++')
     DLLTOOL = ''
-    LD = path_join(tools_path, name_fmt % 'ld')
-    OBJDUMP = path_join(tools_path, name_fmt % 'objdump')
-    RANLIB = path_join(tools_path, name_fmt % 'ranlib')
+    LD = path_join(tools_path, name_fmt_no_api % 'ld')
+    OBJDUMP = path_join(tools_path, 'llvm-objdump')
+    RANLIB = path_join(tools_path, 'llvm-ranlib')
     CMAKE = path_join(sdk_cmake_dir, 'bin', 'cmake')
-    STRIP = path_join(tools_path, name_fmt % 'strip')
+    STRIP = path_join(tools_path, 'llvm-strip')
 
-    CPP = path_join(tools_path, name_fmt % 'cpp')
+    CPP = path_join(tools_path, name_fmt_with_api % 'cpp')
     if not os.path.isfile(CPP):
-        CPP = path_join(tools_path, (name_fmt % 'clang'))
+        CPP = path_join(tools_path, (name_fmt_with_api % 'clang'))
         CPP += ' -E'
 
-    CXXCPP = path_join(tools_path, name_fmt % 'cpp')
+    CXXCPP = path_join(tools_path, name_fmt_with_api % 'cpp')
     if not os.path.isfile(CXXCPP):
-        CXXCPP = path_join(tools_path, (name_fmt % 'clang++'))
+        CXXCPP = path_join(tools_path, (name_fmt_with_api % 'clang++'))
         CXXCPP += ' -E'
 
     ccache_path = os.environ.get('CCACHE', '')
@@ -176,14 +166,14 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
     CFLAGS += [
         '-fstack-protector',
         '-DMONODROID=1'
+        '-D__ANDROID_API__=' + api,
     ]
-    CFLAGS += ['-D__ANDROID_API__=' + api] if android_new_ndk else []
 
     CXXFLAGS += [
         '-fstack-protector',
         '-DMONODROID=1'
+        '-D__ANDROID_API__=' + api,
     ]
-    CXXFLAGS += ['-D__ANDROID_API__=' + api] if android_new_ndk else []
 
     CPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path]
     CXXCPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path]
@@ -192,7 +182,7 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
 
     LDFLAGS += [
         '-z', 'now', '-z', 'relro', '-z', 'noexecstack',
-        '-ldl', '-lm', '-llog', '-lc', '-lgcc',
+        '-ldl', '-lm', '-llog', '-lc',
         '-Wl,-rpath-link=%s,-dynamic-linker=/system/bin/linker' % path_link,
         '-L' + path_link
     ]
@@ -216,7 +206,7 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
     ]
 
     CONFIGURE_FLAGS += ['--enable-monodroid']
-    CONFIGURE_FLAGS += ['--with-btls-android-ndk-asm-workaround'] if android_new_ndk else []
+    CONFIGURE_FLAGS += ['--with-btls-android-ndk-asm-workaround']
 
     CONFIGURE_FLAGS += [
         '--with-btls-android-cmake-toolchain=%s/build/cmake/android.toolchain.cmake' % opts.android_ndk_root,
@@ -410,23 +400,12 @@ def setup_android_cross_mxe_template(env: dict, opts: AndroidOpts, target: str,
     runtime.setup_runtime_cross_template(env, opts, 'android', target, host_triple, target_triple, device_target, 'llvmwin64', offsets_dumper_abi)
 
 
-def make_standalone_toolchain(opts: AndroidOpts, target: str, api: str):
-    install_dir = path_join(opts.android_toolchains_prefix, opts.toolchain_name_fmt % (target, api))
-    if os.path.isdir(path_join(install_dir, 'bin')):
-        return # Looks like it's already there, so no need to re-create it
-    command = path_join(opts.android_ndk_root, 'build', 'tools', 'make_standalone_toolchain.py')
-    args = [command, '--verbose', '--force', '--api=' + api, '--arch=' + AndroidTargetTable.archs[target],
-            '--install-dir=' + install_dir]
-    run_command('python3', args=args, name='make_standalone_toolchain')
-
-
 def strip_libs(opts: AndroidOpts, product: str, target: str, api: str):
-    toolchain_path = path_join(opts.android_toolchains_prefix, opts.toolchain_name_fmt % (target, api))
+    toolchain_path = path_join(opts.android_ndk_root, 'toolchains/llvm/prebuilt/linux-x86_64')
 
     tools_path = path_join(toolchain_path, 'bin')
-    name_fmt = AndroidTargetTable.abi_names[target] + '-%s'
 
-    strip = path_join(tools_path, name_fmt % 'strip')
+    strip = path_join(tools_path, 'llvm-strip')
 
     install_dir = path_join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration))
     out_libs_dir = path_join(install_dir, 'lib')
@@ -449,7 +428,6 @@ def configure(opts: AndroidOpts, product: str, target: str):
             llvm.make(opts, 'llvm64')
             setup_android_cross_template(env, opts, target, host_arch='x86_64')
     else:
-        make_standalone_toolchain(opts, target, env['ANDROID_API_VERSION'])
         setup_android_target_template(env, opts, target)
 
     if not os.path.isfile(path_join(opts.mono_source_root, 'configure')):
@@ -513,18 +491,17 @@ def main(raw_args):
 
     home = os.environ.get('HOME')
     android_sdk_default = os.environ.get('ANDROID_HOME', os.environ.get('ANDROID_SDK_ROOT', path_join(home, 'Android/Sdk')))
-    android_ndk_default = os.environ.get('ANDROID_NDK_ROOT', path_join(android_sdk_default, 'ndk-bundle'))
+    android_ndk_default = os.environ.get('ANDROID_NDK_ROOT', '')
 
     default_help = 'default: %(default)s'
 
     parser.add_argument('action', choices=['configure', 'make', 'clean'])
     parser.add_argument('--target', choices=target_values, action='append', required=True)
-    parser.add_argument('--toolchains-prefix', default=path_join(home, 'android-toolchains'), help=default_help)
     parser.add_argument('--android-sdk', default=android_sdk_default, help=default_help)
     parser.add_argument('--android-ndk', default=android_ndk_default, help=default_help)
     # Default API version should be in sync with Godot's platform/android/detect.py.
     # Note that `get_api_version_or_min` will upgrade it to 21 for arm64v8 and x86_64.
-    parser.add_argument('--android-api-version', default='18', help=default_help)
+    parser.add_argument('--android-api-version', default='24', help=default_help)
     parser.add_argument('--android-cmake-version', default='autodetect', help=default_help)
 
     cmd_utils.add_runtime_arguments(parser, default_help)
@@ -540,6 +517,22 @@ def main(raw_args):
         print('Mono sources directory not found: ' + opts.mono_source_root)
         sys.exit(1)
 
+    if not opts.android_sdk_root:
+        print('Please specify the location of the Android SDK (\'--android-sdk\')')
+        sys.exit(1)
+
+    if not os.path.isdir(opts.android_sdk_root):
+        print('Android SDK directory not found: ' + opts.android_sdk_root)
+        sys.exit(1)
+
+    if not opts.android_ndk_root:
+        print('Please specify the location of the Android NDK (\'--android-ndk\')')
+        sys.exit(1)
+
+    if not opts.android_ndk_root or not os.path.isdir(opts.android_ndk_root):
+        print('Android NDK directory not found: ' + opts.android_ndk_root)
+        sys.exit(1)
+
     targets = cmd_utils.expand_input_targets(input_targets, target_shortcuts)
     action = actions[input_action]
 

bcl.py

@@ -40,7 +40,7 @@ def get_profile_install_dirs(opts: BaseOpts, product: str):
     profiles = profiles_table[product]
     return [path_join(install_dir, get_profile_dir(profile, product)) for profile in profiles]
 
-def configure_bcl(opts: BclOpts):
+def configure_bcl(opts: BclOpts, product: str):
     stamp_file = path_join(opts.configure_dir, '.stamp-bcl-configure')
 
     if os.path.isfile(stamp_file):
@@ -54,12 +54,21 @@ def configure_bcl(opts: BclOpts):
 
     CONFIGURE_FLAGS = [
         '--disable-boehm',
-        '--disable-btls-lib',
         '--disable-nls',
         '--disable-support-build',
         '--with-mcs-docs=no'
     ]
 
+    if product == 'desktop-win32':
+        CONFIGURE_FLAGS += [
+            '--enable-btls',
+            '--enable-btls-lib'
+        ]
+    else:
+        CONFIGURE_FLAGS += [
+            '--disable-btls-lib'
+        ]
+
     configure = path_join(opts.mono_source_root, 'configure')
     configure_args = CONFIGURE_FLAGS
 
@@ -84,8 +93,8 @@ def make_bcl(opts: BclOpts):
     touch(stamp_file)
 
 
-def build_bcl(opts: BclOpts):
-    configure_bcl(opts)
+def build_bcl(opts: BclOpts, product: str):
+    configure_bcl(opts, product)
     make_bcl(opts)
 
 
@@ -97,7 +106,7 @@ def clean_bcl(opts: BclOpts):
 
 
 def make_product(opts: BclOpts, product: str):
-    build_bcl(opts)
+    build_bcl(opts, product)
 
     build_dir = path_join(opts.configure_dir, 'bcl')
 
@@ -178,6 +187,25 @@ def make_product(opts: BclOpts, product: str):
 
         run_command('csc', android_env_csc_args)
 
+    # (custom 'Xamarin.iOS.dll')
+    if product == 'ios':
+        this_script_dir = os.path.dirname(os.path.realpath(__file__))
+        monotouch_profile_dir = '%s/%s' % (install_dir, 'monotouch')
+        refs = ['mscorlib.dll', 'System.Net.Http.dll']
+
+        mkdir_p(monotouch_profile_dir)
+
+        android_env_csc_args = [
+            path_join(this_script_dir, 'files', 'xi.cs'),
+            '-keyfile:' + path_join(this_script_dir, 'files', 'xi.snk'),
+            '-out:%s' % path_join(monotouch_profile_dir, 'Xamarin.iOS.dll'),
+            '-optimize', '-deterministic', '-publicsign', '-target:library',
+            '-nostdlib', '-noconfig', '-langversion:latest'
+        ]
+        android_env_csc_args += ['-r:%s' % path_join(monotouch_profile_dir, r) for r in refs]
+
+        run_command('csc', android_env_csc_args)
+
 
 def clean_product(opts: BclOpts, product: str):
     clean_bcl(opts)

desktop.py

@@ -15,7 +15,7 @@ import runtime
 targets = {
     'linux': ['x86', 'x86_64'],
     'windows': ['x86', 'x86_64'],
-    'osx': ['x86_64']
+    'osx': ['arm64', 'x86_64']
 }
 
 target_arch = {
@@ -28,14 +28,24 @@ target_arch = {
         'x86_64': 'x86_64'
     },
     'osx': {
+        'arm64': 'arm64',
         'x86_64': 'x86_64'
     }
 }
 
 host_triples = {
-    'linux': '%s-linux-gnu',
-    'windows': '%s-w64-mingw32',
-    'osx': '%s-apple-darwin',
+    'linux': {
+        'x86': 'i686-linux-gnu',
+        'x86_64': 'x86_64-linux-gnu'
+    },
+    'windows': {
+        'x86': 'i686-w64-mingw32',
+        'x86_64': 'x86_64-w64-mingw32'
+    },
+    'osx': {
+        'arm64': 'aarch64-apple-darwin20',
+        'x86_64': 'x86_64-apple-darwin'
+    }
 }
 
 llvm_table = {
@@ -70,14 +80,16 @@ def get_osxcross_sdk(osxcross_bin, arch):
 
 
 def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_platform: str, target: str):
-    host_triple = host_triples[target_platform] % target_arch[target_platform][target]
+    host_triple = host_triples[target_platform][target]
 
     CONFIGURE_FLAGS = [
         '--disable-boehm',
         '--disable-mcs-build',
         '--enable-maintainer-mode',
         '--with-tls=pthread',
-        '--without-ikvm-native'
+        '--without-ikvm-native',
+        '--enable-btls',
+        '--enable-btls-lib'
     ]
 
     if target_platform == 'windows':
@@ -88,7 +100,6 @@ def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_pl
         CONFIGURE_FLAGS += [
             '--disable-iconv',
             '--disable-nls',
-            '--enable-dynamic-btls',
             '--with-sigaltstack=yes',
         ]
 
@@ -137,7 +148,20 @@ def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_pl
             # DTrace is not available when building with OSXCROSS
             CONFIGURE_FLAGS += ['--enable-dtrace=no']
         else:
-            env['_%s-%s_CC' % (product, target)] = 'cc'
+            osx_toolchain = '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'
+
+            env['_%s-%s_CC' % (product, target)] = '%s/usr/bin/clang' % osx_toolchain
+            env['_%s-%s_CXX' % (product, target)] = '%s/usr/bin/clang++' % osx_toolchain
+
+            osx_sysroot = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
+
+            CFLAGS = [
+                '-isysroot', osx_sysroot,
+                '-arch', target_arch[target_platform][target]
+            ]
+
+            env['_%s-%s_CFLAGS' % (product, target)] = CFLAGS
+            env['_%s-%s_CXXFLAGS' % (product, target)] = CFLAGS
 
     env['_%s-%s_CONFIGURE_FLAGS' % (product, target)] = CONFIGURE_FLAGS
 
@@ -187,6 +211,14 @@ def configure(opts: DesktopOpts, product: str, target_platform: str, target: str
 def make(opts: DesktopOpts, product: str, target_platform: str, target: str):
     build_dir = path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
 
+    if target_platform == 'windows':
+        mxe = 'mxe-Win64' if target == 'x86_64' else 'mxe-Win32'
+        replace_in_new_file(
+            src_file='%s/sdks/builds/%s.cmake.in' % (opts.mono_source_root, mxe),
+            search='@MXE_PATH@', replace=opts.mxe_prefix,
+            dst_file='%s/mono/btls/%s.cmake' % (opts.mono_source_root, mxe)
+        )
+
     make_args = make_default_args(opts)
     make_args += ['-C', build_dir]
 
@@ -202,7 +234,7 @@ def copy_bcl(opts: DesktopOpts, product: str, target_platform: str, target: str)
     from distutils.dir_util import copy_tree
     from bcl import get_profile_install_dirs
     dest_dir = path_join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration), 'lib/mono/4.5')
-    for src_dir in get_profile_install_dirs(opts, 'desktop'):
+    for src_dir in get_profile_install_dirs(opts, 'desktop-win32' if target_platform == 'windows' else 'desktop'):
         if not os.path.isdir(src_dir):
             raise BuildError('BCL source directory does not exist: %s. The BCL must be built prior to this.' % src_dir)
         copy_tree(src_dir, dest_dir)

files/patches/btls-cmake-args-linux-mingw.diff

@@ -0,0 +1,33 @@
+diff --git a/configure.ac b/configure.ac
+index 088128e5e74..54693aace64 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5918,6 +5918,8 @@ if test "x$enable_btls" = "xyes"; then
+ 				if test "x$HAVE_YASM" != "xyes"; then
+ 					BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
+ 				fi
++				mono_btls_dir_abs=`cd $srcdir && pwd`/mono/btls
++				BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCYGWIN=TRUE -DCMAKE_TOOLCHAIN_FILE=\"$mono_btls_dir_abs/mxe-Win32.cmake\""
+ 				;;
+ 		esac
+ 		;;
+@@ -5929,6 +5931,8 @@ if test "x$enable_btls" = "xyes"; then
+ 				if test "x$HAVE_YASM" != "xyes"; then
+ 					BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
+ 				fi
++				mono_btls_dir_abs=`cd $srcdir && pwd`/mono/btls
++				BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCYGWIN=TRUE -DCMAKE_TOOLCHAIN_FILE=\"$mono_btls_dir_abs/mxe-Win64.cmake\""
+ 				;;
+ 		esac
+ 		;;
+diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
+index 992f41e4c7f..9946f5d21a4 100644
+--- a/mono/btls/CMakeLists.txt
++++ b/mono/btls/CMakeLists.txt
+@@ -129,4 +129,5 @@ endif ()
+ 
+ if (CYGWIN)
+ 	target_link_libraries (mono-btls-shared wsock32 ws2_32)
++	target_link_options (mono-btls-shared PRIVATE -static-libgcc)
+ endif ()
+\ No newline at end of file

files/patches/fix-mono-log-spam.diff

@@ -0,0 +1,48 @@
+diff --git a/mono/metadata/threadpool-io.c b/mono/metadata/threadpool-io.c
+index fdfef2de91e28..45ac0d84b2429 100644
+--- a/mono/metadata/threadpool-io.c
++++ b/mono/metadata/threadpool-io.c
+@@ -180,6 +180,7 @@ selector_thread_wakeup_drain_pipes (void)
+ {
+ 	gchar buffer [128];
+ 	gint received;
++	static gint warnings_issued = 0;
+
+ 	for (;;) {
+ #if !defined(HOST_WIN32)
+@@ -192,11 +193,16 @@ selector_thread_wakeup_drain_pipes (void)
+ 			 * some unices (like AIX) send ERESTART, which doesn't
+ 			 * exist on some other OSes errno
+ 			 */
+-			if (errno != EINTR && errno != EAGAIN && errno != ERESTART)
++			if (errno != EINTR && errno != EAGAIN && errno != ERESTART) {
+ #else
+-			if (errno != EINTR && errno != EAGAIN)
++			if (errno != EINTR && errno != EAGAIN) {
+ #endif
+-				g_warning ("selector_thread_wakeup_drain_pipes: read () failed, error (%d) %s\n", errno, g_strerror (errno));
++				// limit amount of spam we write
++				if (warnings_issued < 100) {
++					g_warning ("selector_thread_wakeup_drain_pipes: read () failed, error (%d) %s\n", errno, g_strerror (errno));
++					warnings_issued++;
++				}
++			}
+ 			break;
+ 		}
+ #else
+@@ -204,8 +210,13 @@ selector_thread_wakeup_drain_pipes (void)
+ 		if (received == 0)
+ 			break;
+ 		if (received == SOCKET_ERROR) {
+-			if (WSAGetLastError () != WSAEINTR && WSAGetLastError () != WSAEWOULDBLOCK)
+-				g_warning ("selector_thread_wakeup_drain_pipes: recv () failed, error (%d)\n", WSAGetLastError ());
++			if (WSAGetLastError () != WSAEINTR && WSAGetLastError () != WSAEWOULDBLOCK) {
++				// limit amount of spam we write
++				if (warnings_issued < 100) {
++					g_warning ("selector_thread_wakeup_drain_pipes: recv () failed, error (%d)\n", WSAGetLastError ());
++					warnings_issued++;
++				}
++			}
+ 			break;
+ 		}
+ #endif

files/xi.cs

@@ -0,0 +1,15 @@
+using System.Net.Http;
+
+[assembly:System.Reflection.AssemblyVersionAttribute ("0.0.0.0")]
+[assembly:System.Runtime.CompilerServices.InternalsVisibleTo ("System.Net.Http, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+namespace ObjCRuntime
+{
+    internal class RuntimeOptions
+    {
+        internal static HttpMessageHandler GetHttpMessageHandler()
+        {
+            return new HttpClientHandler();
+        }
+    }
+}

ios.py

@@ -14,7 +14,7 @@ import runtime
 this_script_dir = os.path.dirname(os.path.realpath(__file__))
 
 device_targets = ['armv7', 'arm64']
-sim_targets = ['i386', 'x86_64']
+sim_targets = ['i386', 'x86_64', 'arm64-sim']
 cross_targets = ['cross-armv7', 'cross-arm64']
 
 
@@ -26,6 +26,7 @@ class iOSTargetTable:
     archs = {
         'armv7': 'arm',
         'arm64': 'arm64',
+        'arm64-sim': 'arm64',
         'i386': 'i386',
         'x86_64': 'x86_64'
     }
@@ -33,6 +34,7 @@ class iOSTargetTable:
     host_triples = {
         'armv7': 'arm-apple-darwin11',
         'arm64': 'aarch64-apple-darwin11',
+        'arm64-sim': 'aarch64-apple-darwin11',
         'i386': 'i386-apple-darwin11',
         'x86_64': 'x86_64-apple-darwin11'
     }
@@ -40,6 +42,7 @@ class iOSTargetTable:
     osxcross_tool_triples = {
         'armv7': 'arm-apple-darwin11', # TODO: ?
         'arm64': 'arm-apple-darwin11',
+        'arm64-sim': 'arm-apple-darwin11',
         'i386': 'i386-apple-darwin11', # TODO: ?
         'x86_64': 'x86_64-apple-darwin11'
     }
@@ -185,7 +188,7 @@ def setup_ios_simulator_template(env: dict, opts: iOSOpts, target: str):
     if not ios_sysroot_path:
         raise RuntimeError('Cannot find iOS SDK; specify one manually with \'--ios-sdk\'.')
 
-    sysroot_flags = ['-isysroot', ios_sysroot_path, '-miphoneos-version-min=%s' % opts.ios_version_min]
+    sysroot_flags = ['-isysroot', ios_sysroot_path, '-mios-simulator-version-min=%s' % opts.ios_version_min]
 
     arch = iOSTargetTable.archs[target]
     host_triple = iOSTargetTable.host_triples[target]
@@ -306,8 +309,11 @@ class iOSCrossTable:
     }
 
 
-def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: str):
+def llvm_for(host_arch: str) -> str:
+    return 'llvmarm64' if host_arch == 'arm64' else 'llvm64'
 
+
+def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: str):
     target_triple = iOSCrossTable.target_triples[target]
     device_target = iOSCrossTable.device_targets[target]
     offsets_dumper_abi = iOSCrossTable.offsets_dumper_abis[target]
@@ -411,7 +417,7 @@ def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: s
     env['_ios-%s_CONFIGURE_FLAGS' % target] = CONFIGURE_FLAGS
 
     # Runtime cross template
-    runtime.setup_runtime_cross_template(env, opts, 'ios', target, host_triple, target_triple, device_target, 'llvm64', offsets_dumper_abi)
+    runtime.setup_runtime_cross_template(env, opts, 'ios', target, host_triple, target_triple, device_target, llvm_for(host_arch), offsets_dumper_abi)
 
 
 def strip_libs(opts: iOSOpts, product: str, target: str):
@@ -427,8 +433,11 @@ def configure(opts: iOSOpts, product: str, target: str):
     if is_cross(target):
         import llvm
 
-        llvm.make(opts, 'llvm64')
-        setup_ios_cross_template(env, opts, target, host_arch='x86_64')
+        host_arch='x86_64'
+
+        llvm.make(opts, llvm_for(host_arch))
+
+        setup_ios_cross_template(env, opts, target, host_arch)
     else:
         if is_sim:
             setup_ios_simulator_template(env, opts, target)

llvm.py

@@ -11,7 +11,7 @@ from os_utils import *
 # TODO: OSXCROSS
 
 
-target_values = ['llvm32', 'llvm64', 'llvmwin32', 'llvmwin64']
+target_values = ['llvm32', 'llvm64', 'llvmarm64', 'llvmwin32', 'llvmwin64']
 mxe_targets = {
     'llvmwin32': {'arch': 'i686', 'mxe': 'mxe-Win32'},
     'llvmwin64': {'arch': 'x86_64', 'mxe': 'mxe-Win64'}

options.py

@@ -23,12 +23,10 @@ class RuntimeOpts(BaseOpts):
 
 @dataclass
 class AndroidOpts(RuntimeOpts):
-    android_toolchains_prefix: str
     android_sdk_root: str
     android_ndk_root: str
     android_api_version: str
     android_cmake_version: str
-    toolchain_name_fmt: str = '%s-api%s-clang'
 
 
 @dataclass
@@ -80,7 +78,6 @@ def runtime_opts_from_args(args):
 def android_opts_from_args(args):
     return AndroidOpts(
         **vars(runtime_opts_from_args(args)),
-        android_toolchains_prefix = abspath(args.toolchains_prefix),
         android_sdk_root = abspath(args.android_sdk),
         android_ndk_root = abspath(args.android_ndk),
         android_api_version = args.android_api_version,

patch_mono.py

@@ -27,10 +27,12 @@ def main(raw_args):
 
     patches = [
         'fix-mono-android-tkill.diff',
+        'fix-mono-log-spam.diff',
         'mono-dbg-agent-clear-tls-instead-of-abort.diff',
         'bcl-profile-platform-override.diff',
         'mono_ios_asl_log_deprecated.diff',
         'wasm_m2n_trampolines_hook.diff',
+        'btls-cmake-args-linux-mingw.diff'
     ]
 
     if os.path.isfile(os.path.join(mono_source_root, 'mono/tools/offsets-tool/offsets-tool.py')):