diff --git a/src/csharp/Grpc.Core/Internal/PlatformApis.cs b/src/csharp/Grpc.Core/Internal/PlatformApis.cs
index 6c4ee0bdb79..c501aa89fb6 100644
--- a/src/csharp/Grpc.Core/Internal/PlatformApis.cs
+++ b/src/csharp/Grpc.Core/Internal/PlatformApis.cs
@@ -33,8 +33,9 @@ namespace Grpc.Core.Internal
internal static class PlatformApis
{
const string UnityEngineApplicationClassName = "UnityEngine.Application, UnityEngine";
- const string XamarinAndroidActivityClassName = "Android.App.Activity, Mono.Android";
- const string XamariniOSEnumClassName = "Mono.CSharp.Enum, Mono.CSharp";
+ const string XamarinAndroidObjectClassName = "Java.Lang.Object, Mono.Android";
+ const string XamarinIOSObjectClassName = "Foundation.NSObject, Xamarin.iOS";
+
static readonly bool isLinux;
static readonly bool isMacOSX;
static readonly bool isWindows;
@@ -42,7 +43,7 @@ namespace Grpc.Core.Internal
static readonly bool isNetCore;
static readonly bool isUnity;
static readonly bool isXamarin;
- static readonly bool isXamariniOS;
+ static readonly bool isXamarinIOS;
static readonly bool isXamarinAndroid;
static PlatformApis()
@@ -63,9 +64,9 @@ namespace Grpc.Core.Internal
#endif
isMono = Type.GetType("Mono.Runtime") != null;
isUnity = Type.GetType(UnityEngineApplicationClassName) != null;
- isXamariniOS = Type.GetType(XamariniOSEnumClassName) != null;
- isXamarinAndroid = Type.GetType(XamarinAndroidActivityClassName) != null;
- isXamarin = isXamariniOS || isXamarinAndroid;
+ isXamarinIOS = Type.GetType(XamarinIOSObjectClassName) != null;
+ isXamarinAndroid = Type.GetType(XamarinAndroidObjectClassName) != null;
+ isXamarin = isXamarinIOS || isXamarinAndroid;
}
public static bool IsLinux
@@ -108,9 +109,9 @@ namespace Grpc.Core.Internal
///
/// true if running on Xamarin.iOS, false otherwise.
///
- public static bool IsXamariniOS
+ public static bool IsXamarinIOS
{
- get { return isXamariniOS; }
+ get { return isXamarinIOS; }
}
///
diff --git a/src/csharp/experimental/build_native_ext_for_android.sh b/src/csharp/experimental/build_native_ext_for_android.sh
index 5687a43a4e2..6518e03c53e 100755
--- a/src/csharp/experimental/build_native_ext_for_android.sh
+++ b/src/csharp/experimental/build_native_ext_for_android.sh
@@ -36,6 +36,7 @@ cd build
# ANDROID_ABI in ('arm64-v8a', 'armeabi-v7a')
# e.g. ANDROID_ABI=armeabi-v7a
+# android-19 corresponds to Kitkat 4.4
${ANDROID_SDK_CMAKE} ../.. \
-DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_PATH}/build/cmake/android.toolchain.cmake" \
-DCMAKE_ANDROID_NDK="${ANDROID_NDK_PATH}" \
@@ -44,7 +45,7 @@ ${ANDROID_SDK_CMAKE} ../.. \
-DRUN_HAVE_STD_REGEX=0 \
-DRUN_HAVE_STEADY_CLOCK=0 \
-DCMAKE_BUILD_TYPE=Release \
- -DANDROID_PLATFORM=android-28 \
+ -DANDROID_PLATFORM=android-19 \
-DANDROID_ABI="${ANDROID_ABI}" \
-DANDROID_NDK="${ANDROID_NDK_PATH}"