From 73b93e08f68d2138cf8a3602de79f94fbb2afe9d Mon Sep 17 00:00:00 2001
From: ThibaultBee <37510686+ThibaultBee@users.noreply.github.com>
Date: Tue, 9 Jul 2024 21:52:34 +0200
Subject: [PATCH] feat(core): upgrade to ndk 26

---
 srtdroid-core/build.gradle.kts            | 2 +-
 srtdroid-core/src/main/cpp/CMakeLists.txt | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srtdroid-core/build.gradle.kts b/srtdroid-core/build.gradle.kts
index 59f037d6..34f816ac 100644
--- a/srtdroid-core/build.gradle.kts
+++ b/srtdroid-core/build.gradle.kts
@@ -9,7 +9,7 @@ configurePublication()
 android {
     namespace = "io.github.thibaultbee.srtdroid.core"
     compileSdk = AndroidVersions.COMPILE_SDK
-    ndkVersion = "21.4.7075529"
+    ndkVersion = "26.1.10909125"
 
     defaultConfig {
         minSdk = AndroidVersions.MIN_SDK
diff --git a/srtdroid-core/src/main/cpp/CMakeLists.txt b/srtdroid-core/src/main/cpp/CMakeLists.txt
index a6b09792..fb49a9ad 100644
--- a/srtdroid-core/src/main/cpp/CMakeLists.txt
+++ b/srtdroid-core/src/main/cpp/CMakeLists.txt
@@ -12,8 +12,8 @@ set(SRT_VERSION "1.5.3")
 ExternalProject_Add(openssl_project
         GIT_REPOSITORY https://github.com/openssl/openssl.git
         GIT_TAG ${OPENSSL_VERSION}
-        CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PATH=${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}/bin:$ENV{PATH} CC=${CMAKE_C_COMPILER} ANDROID_NDK_ROOT=${ANDROID_NDK} perl <SOURCE_DIR>/Configure android-${ANDROID_ARCH_NAME} -D__ANDROID_API__=${ANDROID_NATIVE_API_LEVEL} --openssldir=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} --libdir="" --prefix=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-        BUILD_COMMAND ${CMAKE_COMMAND} -E env PATH=${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}/bin:$ENV{PATH} ANDROID_NDK_ROOT=${ANDROID_NDK} make
+        CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PATH=${ANDROID_TOOLCHAIN_ROOT}/bin:$ENV{PATH} CC=${CMAKE_C_COMPILER} ANDROID_NDK_ROOT=${ANDROID_NDK} perl <SOURCE_DIR>/Configure android-${ANDROID_ARCH_NAME} --openssldir=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} --libdir="" --prefix=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+        BUILD_COMMAND ${CMAKE_COMMAND} -E env PATH=${ANDROID_TOOLCHAIN_ROOT}/bin:$ENV{PATH} ANDROID_NDK_ROOT=${ANDROID_NDK} make
         BUILD_BYPRODUCTS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libssl.so ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libcrypto.so
         BUILD_IN_SOURCE 1
         )
@@ -54,9 +54,9 @@ ExternalProject_Add(srt_project
         -DANDROID_CPP_FEATURES=${ANDROID_CPP_FEATURES}
         -DANDROID_ALLOW_UNDEFINED_SYMBOLS=${ANDROID_ALLOW_UNDEFINED_SYMBOLS}
         -DANDROID_ARM_MODE=${ANDROID_ARM_MODE}
-        -DANDROID_ARM_NEON=${ANDROID_ARM_NEON}
         -DANDROID_DISABLE_FORMAT_STRING_CHECKS=${ANDROID_DISABLE_FORMAT_STRING_CHECKS}
         -DANDROID_CCACHE=${ANDROID_CCACHE}
+        -DANDROID_SANITIZE=${ANDROID_SANITIZE}
         BUILD_BYPRODUCTS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsrt.so
         DEPENDS crypto ssl
         BUILD_IN_SOURCE 1