ClearFoundry · KurtGokhan · Sep 12, 2021 · Sep 12, 2021 · Oct 21, 2021 · Oct 21, 2021
diff --git a/ClearScript/HostSettings.cs b/ClearScript/HostSettings.cs
@@ -38,6 +38,15 @@ public static class HostSettings
         //github.com/ </remarks>
         public static string AuxiliarySearchPath { get; set; }
 
+        //github.com/ <summary>
+        //github.com/ Sets the runtime platform to android and loads android native binaries.
+        //github.com/ </summary>
+        //github.com/ <remarks>
+        //github.com/ This property allows ClearScript to load android native assemblies instead of 
+        //github.com/ linux assemblies on Android Mono
+        //github.com/ </remarks>
+        public static bool IsAndroid { get; set; }
+
         //github.com/ <summary>
         //github.com/ Gets or sets the custom attribute loader for ClearScript.
         //github.com/ </summary>

diff --git a/ClearScript/Util/MiscHelpers.cs b/ClearScript/Util/MiscHelpers.cs
@@ -554,7 +554,12 @@ public static bool PlatformIsWindows()
 
         public static bool PlatformIsLinux()
         {
-            return RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+            return !HostSettings.IsAndroid && RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+        }
+
+        public static bool PlatformIsAndroid()
+        {
+            return HostSettings.IsAndroid;
         }
 
         public static bool PlatformIsOSX()

diff --git a/ClearScript/Util/NativeMethods.cs b/ClearScript/Util/NativeMethods.cs
@@ -16,6 +16,11 @@ public static IntPtr LoadLibrary(string path)
                 return NativeWindowsMethods.LoadLibraryW(path);
             }
 
+            if (MiscHelpers.PlatformIsAndroid())
+            {
+                return NativeAndroidMethods.LoadLibrary(path);
+            }
+
             if (MiscHelpers.PlatformIsLinux())
             {
                 return NativeLinuxMethods.LoadLibrary(path);
@@ -34,6 +39,11 @@ public static bool FreeLibrary(IntPtr hLibrary)
             if (MiscHelpers.PlatformIsWindows())
             {
                 return NativeWindowsMethods.FreeLibrary(hLibrary);
+            }
+
+            if (MiscHelpers.PlatformIsAndroid())
+            {
+                return NativeAndroidMethods.FreeLibrary(hLibrary) == 0;
             }
 
             if (MiscHelpers.PlatformIsLinux())
@@ -54,6 +64,11 @@ public static string GetLoadLibraryErrorMessage()
             if (MiscHelpers.PlatformIsWindows())
             {
                 return new Win32Exception().Message;
+            }
+
+            if (MiscHelpers.PlatformIsAndroid())
+            {
+                return Marshal.PtrToStringAnsi(NativeAndroidMethods.GetLoadLibraryErrorMessage());
             }
 
             if (MiscHelpers.PlatformIsLinux())
@@ -254,12 +269,12 @@ [Out] out uint oldProtect
             );
 
             // ReSharper restore MemberHidesStaticFromOuterClass
-        }
-
+        }
+
         #endregion
-
+
         #region Nested type: NativeLinuxMethods
-
+
         private static class NativeLinuxMethods
         {
             // ReSharper disable MemberHidesStaticFromOuterClass
@@ -284,7 +299,46 @@ public enum LoadLibraryFlags
 
             [DllImport("libdl.so.2", EntryPoint = "dlopen")]
             public static extern IntPtr LoadLibrary(
-                [In] [MarshalAs(UnmanagedType.LPStr)] string path,
+                [In][MarshalAs(UnmanagedType.LPStr)] string path,
+                [In] LoadLibraryFlags flags = LoadLibraryFlags.Now | LoadLibraryFlags.Global
+            );
+
+            [DllImport("libdl.so", EntryPoint = "dlclose")]
+            public static extern int FreeLibrary(
+                [In] IntPtr hLibrary
+            );
+
+            [DllImport("libdl.so", EntryPoint = "dlerror")]
+            public static extern IntPtr GetLoadLibraryErrorMessage();
+
+            // ReSharper restore MemberHidesStaticFromOuterClass
+        }
+
+        #endregion
+
+        #region Nested type: NativeLinuxMethods
+
+        private static class NativeAndroidMethods
+        {
+            // ReSharper disable MemberHidesStaticFromOuterClass
+
+            [Flags]
+            public enum LoadLibraryFlags
+            {
+                // ReSharper disable UnusedMember.Local
+
+                None = 0,
+                Now = 0,
+                Lazy = 1,
+                Local = 0,
+                Global = 2,
+
+                // ReSharper restore UnusedMember.Local
+            }
+
+            [DllImport("libdl.so", EntryPoint = "dlopen")]
+            public static extern IntPtr LoadLibrary(
+                [In][MarshalAs(UnmanagedType.LPStr)] string path,
                 [In] LoadLibraryFlags flags = LoadLibraryFlags.Now | LoadLibraryFlags.Global
             );
 

diff --git a/ClearScript/V8/SplitProxy/V8SplitProxyNative.Common.tt b/ClearScript/V8/SplitProxy/V8SplitProxyNative.Common.tt
@@ -10,21 +10,19 @@ namespace Microsoft.ClearScript.V8.SplitProxy
     {
         private static IV8SplitProxyNative CreateInstance()
         {
-            var architecture = RuntimeInformation.ProcessArchitecture;
-
             <#
             foreach (var osPlatform in platforms.Select(testPlatform => testPlatform.Item1).Distinct())
             {
             #>
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.<#= osPlatform #>))
+            if (IsOSPlatform("<#= osPlatform #>"))
             {
                 <#
                 foreach (var platform in platforms.Where(testPlatform => testPlatform.Item1 == osPlatform))
                 {
                 #>
 
-                if (architecture == Architecture.<#= platform.Item2 #>)
+                if (IsArchitecture("<#= osPlatform #>", "<#= platform.Item2 #>"))
                 {
                     return new <#= $"Impl_{osPlatform}_{platform.Item2}" #>();
                 }