diff --git a/android/conf_arm.sh b/android/conf_arm.sh
index cab3175..9a2e655 100644
--- a/android/conf_arm.sh
+++ b/android/conf_arm.sh
@@ -46,7 +46,7 @@ ldflags=(
   "-Wl,--whole-archive"
   "-Wl,--no-whole-archive"
   "-lc"
-  "-lstdc++"
+  "-lc++_static"
   "-lm"
   "-Wl,-z,noexecstack"
   "-Wl,-z,relro"
diff --git a/android/conf_mips.sh b/android/conf_mips.sh
index f932d48..7fd3c8b 100644
--- a/android/conf_mips.sh
+++ b/android/conf_mips.sh
@@ -44,7 +44,7 @@ ldflags=(
   "-Wl,--whole-archive"
   "-Wl,--no-whole-archive"
   "-lc"
-  "-lstdc++"
+  "-lc++_static"
   "-lm"
   "-Wl,-z,noexecstack"
   "-Wl,-z,relro"
diff --git a/android/conf_x86.sh b/android/conf_x86.sh
index 62de348..174d311 100644
--- a/android/conf_x86.sh
+++ b/android/conf_x86.sh
@@ -49,7 +49,7 @@ ldflags=(
   "-Wl,--whole-archive"
   "-Wl,--no-whole-archive"
   "-lc"
-  "-lstdc++"
+  "-lc++_static"
   "-lm"
   "-Wl,--no-undefined"
   "-ldl"
diff --git a/unity/build.pl b/unity/build.pl
index 8d8ba02..8b0f6f5 100644
--- a/unity/build.pl
+++ b/unity/build.pl
@@ -9,7 +9,7 @@ use File::Spec qw(rel2abs);
 use lib File::Spec->rel2abs(dirname(__FILE__)) . '/perl';
 use PrepareAndroidSDK;
 
-PrepareAndroidSDK::GetAndroidSDK('android-21', undef, 'r16b');
+PrepareAndroidSDK::GetAndroidSDK('android-21', undef, 'r19');
 
 die('ANDROID_NDK_ROOT environment variable is not set') unless $ENV{ANDROID_NDK_ROOT};
 chdir(File::Spec->rel2abs(dirname(__FILE__)));
diff --git a/unity/perl/PrepareAndroidSDK.pm b/unity/perl/PrepareAndroidSDK.pm
index e94bdd3..c6dded7 100644
--- a/unity/perl/PrepareAndroidSDK.pm
+++ b/unity/perl/PrepareAndroidSDK.pm
@@ -181,6 +181,12 @@ our $ndks =
         "macosx"  => "android-ndk-r17-darwin-x86_64.zip",
         "linux"   => "android-ndk-r17-linux-x86_64.zip",
         },
+    "r19" =>
+        {
+        "windows" => "android-ndk-r19-windows-x86_64.zip",
+        "macosx"  => "android-ndk-r19-darwin-x86_64.zip",
+        "linux"   => "android-ndk-r19-linux-x86_64.zip",
+        },
     };
 
 our $sourcePropVersions =
@@ -188,6 +194,7 @@ our $sourcePropVersions =
     "13.1.3345770" => "r13b (64-bit)",
     "16.1.4479499" => "r16b (64-bit)",
     "17.0.4754217" => "r17 (64-bit)",
+    "19.0.5232133" => "r19 (64-bit)",
     };
 
 our ($HOST_ENV, $TMP, $HOME, $WINZIP);
@@ -587,7 +594,7 @@ sub PrepareNDK
     die("Unknown NDK release '$ndk' (for $HOST_ENV)") if (!$archive);
 
     print "\tDownloading '$ndk' to '$ndk_root'\n";
-    if ($ndk =~ m/r13/ or $ndk =~ m/r16/ or $ndk =~ m/r17/)
+    if ($ndk =~ m/r13/ or $ndk =~ m/r16/ or $ndk =~ m/r17/ or $ndk =~ m/r19/)
     {
         DownloadAndUnpackArchive($BASE_URL_SDK . $archive, $ndk_root);
     }