From 362d3aceb9490895dc0d08044a278c88eac5c40d Mon Sep 17 00:00:00 2001
From: fuwa <fuwa25519@protonmail.com>
Date: Sat, 19 Dec 2020 09:20:33 +0800
Subject: [PATCH] update ndk

---
 etc/nix/shell.nix                      | 10 +++++-----
 etc/scripts/build-external-libs/env.sh |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etc/nix/shell.nix b/etc/nix/shell.nix
index f4113b3..6314085 100644
--- a/etc/nix/shell.nix
+++ b/etc/nix/shell.nix
@@ -61,14 +61,14 @@ let
     ; sha256 = "02q1hy423syl868jdyaxjm44hn59cmni5019r811vinagvq3m7qi"
     ; }
 
-; ndk-r21b =
+; ndk-r21d =
     let
-      version = "r21b"
+      version = "r21d"
     ; in
     nixpkgs.fetchzip
     {
       url = "https://dl.google.com/android/repository/android-ndk-${version}-linux-x86_64.zip"
-    ; sha256 = "0shz45b6f2k4lnca8fgghh4cdh53vghfn26cj4mkirkk4cpv1qry"
+    ; sha256 = "0jc3pd0022bgld7k3sy9sc1n0ahfbcx194gil2ka3p8s4nyf0fsg"
     ; }
 
 ; openssl-source =
@@ -187,8 +187,8 @@ with nixpkgs;
     PATH=~/SDK/Android/android-studio/bin:$PATH
     PATH=~/SDK/Android/Sdk/tools/bin:$PATH
 
-    export ANDROID_NDK_VERSION=r21b
-    export ANDROID_NDK_ROOT=${ndk-r21b}
+    export ANDROID_NDK_VERSION=r21d
+    export ANDROID_NDK_ROOT=${ndk-r21d}
     export NDK=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64
     PATH=$NDK/bin:$PATH
 
diff --git a/etc/scripts/build-external-libs/env.sh b/etc/scripts/build-external-libs/env.sh
index 252aa62..916e111 100644
--- a/etc/scripts/build-external-libs/env.sh
+++ b/etc/scripts/build-external-libs/env.sh
@@ -29,13 +29,13 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-DEFAULT_ANDROID_NDK_ROOT=~/SDK/Android/ndk-archive/android-ndk-r21b
+DEFAULT_ANDROID_NDK_VERSION=r21d
+ANDROID_NDK_VERSION="${ANDROID_NDK_VERSION:-${DEFAULT_ANDROID_NDK_VERSION}}"
+
+DEFAULT_ANDROID_NDK_ROOT=~/SDK/Android/ndk-archive/android-ndk-${ANDROID_NDK_VERSION}
 ANDROID_NDK_ROOT="${ANDROID_NDK_ROOT:-${DEFAULT_ANDROID_NDK_ROOT}}"
 export ANDROID_NDK_ROOT=`realpath $ANDROID_NDK_ROOT`
 
-DEFAULT_ANDROID_NDK_VERSION=r21b
-ANDROID_NDK_VERSION="${ANDROID_NDK_VERSION:-${DEFAULT_ANDROID_NDK_VERSION}}"
-
 BUILD_PATH=../lolnode-build
 
 DEFAULT_BUILD_ROOT=${BUILD_PATH}/$ANDROID_NDK_VERSION