From 5bdae2f735d042965b768cdacde6644d10afc9ca Mon Sep 17 00:00:00 2001
From: Boulay Mathias <mathiasboulay@free.fr>
Date: Wed, 3 May 2023 18:12:36 +0200
Subject: [PATCH] Feat: setup ndk separated

---
 .github/workflows/build.yml | 2 +-
 ci_build_global.sh          | 4 +---
 extractndk.sh               | 2 --
 setupndk.sh                 | 9 +++++++++
 4 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100755 extractndk.sh
 create mode 100644 setupndk.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d92e0b..5c8c48a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Setup ndk
-      run: bash ""
+      run: bash "setupndk.sh"
     - name: Checkout repository
       uses: actions/checkout@v2
     - name: Get jre17-aarch32
diff --git a/ci_build_global.sh b/ci_build_global.sh
index 2e262a2..b6a1008 100755
--- a/ci_build_global.sh
+++ b/ci_build_global.sh
@@ -8,9 +8,7 @@ if [ "$BUILD_IOS" != "1" ]; then
   sudo apt update
   sudo apt -y install autoconf python unzip zip
 
-  wget -nc -nv -O android-ndk-$NDK_VERSION-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip"
-  ./extractndk.sh
-  ./maketoolchain.sh
+  ./setupndk.sh
 else
   chmod +x ios-arm64-clang
   chmod +x ios-arm64-clang++
diff --git a/extractndk.sh b/extractndk.sh
deleted file mode 100755
index 785ed36..0000000
--- a/extractndk.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip
diff --git a/setupndk.sh b/setupndk.sh
new file mode 100644
index 0000000..2f93100
--- /dev/null
+++ b/setupndk.sh
@@ -0,0 +1,9 @@
+set -e
+
+#Setup the ndk according to the selected version
+
+wget -nc -nv -O android-ndk-$NDK_VERSION-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip"
+
+unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip
+
+./maketoolchain.sh
\ No newline at end of file