Refactor android ndk PATH env handling

Remove unused test

Author: tobias-schwerdtfeger

libs/openssl/wrapper/CMakeLists.txt

@@ -4,8 +4,6 @@ set(CMAKE_CXX_STANDARD 23)
 
 project(crypto)
 
-# enable_testing()
-
 ### OpenSSL
 
 include(cmake/openssl.cmake)
@@ -39,6 +37,13 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     add_library(oh_crypto SHARED ${PROJECT_ROOT_DIR}/crypto-jvm-swig/build/generated/sources/jni/crypto.cpp)
     target_include_directories(oh_crypto PRIVATE src)
     target_link_libraries(oh_crypto PRIVATE oh_crypto_base OpenSSL::Crypto JNI::JNI)
+
+    if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+            target_compile_options(oh_crypto PRIVATE -stdlib=libc++)
+            target_link_options(oh_crypto PRIVATE -stdlib=libc++)
+        endif()
+    endif()
 else ()
     # Build the lib as a wasm module using Emscripten
     add_executable(oh_crypto src/ems_wrapper.cpp)
@@ -71,5 +76,3 @@ else ()
         target_link_options(oh_crypto PRIVATE -Oz -flto)
     endif ()
 endif ()
-
-#add_subdirectory(test)

libs/openssl/wrapper/cmake/openssl.cmake

@@ -18,6 +18,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
     set(_OPENSSL_LIB_PATH "lib")
     set(_OPENSSL_LIB_SUFFIX "a")
 
+    # OpenSSL requires the android toolchain on the PATH
+    file(GLOB NDK_DIRS "$ENV{ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/*/bin")
+    list(GET NDK_DIRS 0 NDK_BIN_PATH)
+
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     #    if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
     #        set(_OPENSSL_TARGET "darwin64-arm64-cc") # macOS ARM target
@@ -74,15 +78,16 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
                 CROSS_COMPILE=\"\" \
                 ${OPENSSL_SOURCE_DIR}/Configure \
                 --prefix=${OPENSSL_INSTALL_DIR} \
-                ${OPENSSL_CONFIG_PARAMS}
-    ${_OPENSSL_TARGET}"
+                ${OPENSSL_CONFIG_PARAMS} \
+                ${_OPENSSL_TARGET}"
     )
 else ()
     set(OPENSSL_CONFIGURE_COMMAND
-            bash -c "${OPENSSL_SOURCE_DIR}/Configure \
+            bash -c "PATH=${NDK_BIN_PATH}:$PATH \
+            ${OPENSSL_SOURCE_DIR}/Configure \
             --prefix=${OPENSSL_INSTALL_DIR} \
-            ${OPENSSL_CONFIG_PARAMS}
-    ${_OPENSSL_TARGET}"
+            ${OPENSSL_CONFIG_PARAMS} \
+            ${_OPENSSL_TARGET}"
     )
 endif ()
 
@@ -97,7 +102,7 @@ ExternalProject_Add(
         CONFIGURE_COMMAND
         ${OPENSSL_CONFIGURE_COMMAND}
         UPDATE_COMMAND ""
-        BUILD_COMMAND make -j14
+        BUILD_COMMAND bash -c "PATH=${NDK_BIN_PATH}:$PATH make -j14"
         BUILD_IN_SOURCE 0
         # required, otherwise ninja fails
         BUILD_BYPRODUCTS ${_OPENSSL_BUILD_TARGET}