Fixed OpenSSL for Android

GeniusVentures · Jul 4, 2024 · 44c058b · 44c058b
1 parent 6267fe3
commit 44c058b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -11,19 +11,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [Linux, Windows, OSX, Android, iOS]
+        target: [Android]
         build_type: [Debug, Release]
         include:
-          - target: Linux
-            host: ubuntu-latest
-          - target: Windows
-            host: windows-latest
-          - target: OSX
-            host: macos-latest
+          # - target: Linux
+          #   host: ubuntu-latest
+          # - target: Windows
+          #   host: windows-latest
+          # - target: OSX
+          #   host: macos-latest
           - target: Android
             host: ubuntu-latest
-          - target: iOS
-            host: macos-latest
+          # - target: iOS
+          #   host: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/build/Android/CMakeLists.txt b/build/Android/CMakeLists.txt
@@ -20,11 +20,6 @@ if(NOT CMAKE_ANDROID_NDK)
     endif()
 endif()
 
-if(NOT DEFINED ENV{ANDROID_TOOLCHAIN})
-    message(WARNING "ANDROID_TOOLCHAIN not set in the environment variables. Setting to ${ANDROID_TOOLCHAIN_ROOT}.")
-    set(ANDROID_TOOLCHAIN ${ANDROID_TOOLCHAIN_ROOT})
-endif()
-
 set(CMAKE_TOOLCHAIN_FILE "${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake")
 
 project(ANDROID_SHARED_THIRD_PARTY LANGUAGES C CXX)
@@ -122,7 +117,7 @@ ExternalProject_Add(openssl
     PREFIX openssl
     SOURCE_DIR "${THIRDPARTY_DIR}/openssl"
     CONFIGURE_COMMAND ""
-    BUILD_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/Openssl-build/build.sh ${OPENSSL_VARIANT} --abi=${OPENSSL_ABI} --api-level=${ANDROID_NATIVE_API_LEVEL} --build-dir=${OPENSSL_ROOT_DIR} --env_path=$ENV{PATH} --env_android_ndk=${CMAKE_ANDROID_NDK} --env_android_toolchain=$ENV{ANDROID_TOOLCHAIN}
+    BUILD_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/Openssl-build/build.sh $<$<CONFIG:Debug>:--debug> --abi=${OPENSSL_ABI} --api-level=${ANDROID_NATIVE_API_LEVEL} --build-dir=${OPENSSL_ROOT_DIR} --env_path=$ENV{PATH} --env_android_ndk=${CMAKE_ANDROID_NDK} --env_android_toolchain=$ENV{ANDROID_TOOLCHAIN}
     BUILD_IN_SOURCE FALSE
     INSTALL_COMMAND make install_dev
 )