Merge branch 'staging' into ios-13

2020-09-10 23:24:26 -05:00
parent 95eabdfd5f 61517de024
commit 86d8c55470
5295 changed files with 137795 additions and 81900 deletions
@@ -46,7 +46,7 @@ rec {

  armv7a-android-prebuilt = {
    config = "armv7a-unknown-linux-androideabi";
-    sdkVer = "24";
+    sdkVer = "29";
    ndkVer = "18b";
    platform = platforms.armv7a-android;
    useAndroidPrebuilt = true;
@@ -54,7 +54,7 @@ rec {

  aarch64-android-prebuilt = {
    config = "aarch64-unknown-linux-android";
-    sdkVer = "24";
+    sdkVer = "29";
    ndkVer = "18b";
    platform = platforms.aarch64-multiplatform;
    useAndroidPrebuilt = true;
@@ -163,6 +163,15 @@ rec {
    libc = "newlib";
  };

+  #
+  # Redox
+  #
+
+  x86_64-unknown-redox = {
+    config = "x86_64-unknown-redox";
+    libc = "relibc";
+  };
+
  #
  # Darwin
  #