From 61f2baa0af6b2a54e0c109e5f73c8ff25f9f2ca6 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Sat, 1 Jun 2019 11:46:58 -0700
Subject: Update libc crate to 0.2.57

This change updates the libc crate to version 0.2.57.

Import subrepo libc/:libc at cdc48ea36d8d2890dba38e8f779001e6855339a2
---
 libc/ci/android-install-ndk.sh | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'libc/ci/android-install-ndk.sh')

diff --git a/libc/ci/android-install-ndk.sh b/libc/ci/android-install-ndk.sh
index 54f7b2e..723e719 100644
--- a/libc/ci/android-install-ndk.sh
+++ b/libc/ci/android-install-ndk.sh
@@ -11,27 +11,40 @@
 
 set -ex
 
-curl --retry 10 -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
-unzip -q android-ndk-r15b-linux-x86_64.zip
+NDK=android-ndk-r19c
+curl --retry 20 -O https://dl.google.com/android/repository/${NDK}-linux-x86_64.zip
+unzip -q ${NDK}-linux-x86_64.zip
 
 case "$1" in
+  arm)
+    arch=arm
+    api=24
+    ;;
+  armv7)
+    arch=arm
+    api=24
+    ;;
   aarch64)
     arch=arm64
+    api=24
     ;;
-
   i686)
     arch=x86
+    api=28
+    ;;
+  x86_64)
+    arch=x86_64
+    api=28
     ;;
-
   *)
-    arch=$1
+    echo "invalid arch: $1"
+    exit 1
     ;;
 esac;
 
-android-ndk-r15b/build/tools/make_standalone_toolchain.py \
-        --unified-headers \
+${NDK}/build/tools/make_standalone_toolchain.py \
         --install-dir "/android/ndk-${1}" \
         --arch "${arch}" \
-        --api 24
+        --api ${api}
 
-rm -rf ./android-ndk-r15b-linux-x86_64.zip ./android-ndk-r15b
+rm -rf ./${NDK}-linux-x86_64.zip ./${NDK}
-- 
cgit v1.2.1