refactor: Fix android build

Fix build for android App.

Log: Fix android build.

Author: re2zero

android/modules/cooperation/src/main/cpp/CMakeLists.txt

@@ -78,24 +78,24 @@ include_directories(${PROJECT_ROOT_DIR}/3rdparty/include)
 # header: openssl
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-#message("   >>> ANDROID_HOME  $ENV{ANDROID_HOME}")
-#
-#if (DEFINED ENV{ANDROID_HOME})
-#    set(ssl_root_path $ENV{ANDROID_HOME}/android_openssl)
-#    list(APPEND android_extra_libs
-#            ${ssl_root_path}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}/libcrypto_1_1.so
-#            ${ssl_root_path}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}/libssl_1_1.so)
-#
-#    set(OPENSSL_ROOT_DIR ${ssl_root_path}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI})
-#    set(OPENSSL_INCLUDE_DIR ${ssl_root_path}/ssl_1.1/include)
-#    set(OPENSSL_LIBRARIES ${android_extra_libs})
-#    set(OPENSSL_VERSION 1.1)
-#else()
-#    message(FATAL_ERROR "ANDROID_HOME环境变量未设置！")
-#endif()
+message("   >>> ANDROID_HOME  $ENV{ANDROID_HOME}")
+
+if (DEFINED ENV{ANDROID_HOME})
+   set(ssl_root_path $ENV{ANDROID_HOME}/android_openssl)
+   list(APPEND android_extra_libs
+           ${ssl_root_path}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}/libcrypto_1_1.so
+           ${ssl_root_path}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}/libssl_1_1.so)
+
+   set(OPENSSL_ROOT_DIR ${ssl_root_path}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI})
+   set(OPENSSL_INCLUDE_DIR ${ssl_root_path}/ssl_1.1/include)
+   set(OPENSSL_LIBRARIES ${android_extra_libs})
+   set(OPENSSL_VERSION 1.1)
+else()
+   message(FATAL_ERROR "ANDROID_HOME环境变量未设置！")
+endif()
 
 # Modules netutil
-# include("${PROJECT_ROOT_DIR}/src/infrastructure")
+include_directories("${PROJECT_ROOT_DIR}/3rdparty")
 add_subdirectory("${PROJECT_ROOT_DIR}/src/infrastructure" "${CMAKE_BINARY_DIR}/infrastructure")
 
 

android/modules/cooperation/src/main/cpp/manager/secureconfig.h

@@ -5,7 +5,7 @@
 #ifndef SECURECONFIG_H
 #define SECURECONFIG_H
 
-#include "server/asio/ssl_context.h"
+#include "asio/ssl_context.h"
 
 class SecureConfig {
 public:

src/infrastructure/CMakeLists.txt

@@ -1,14 +1,16 @@
 # import non-boost asio
 include("asio.cmake")
 
+if (ANDROID)
+include("android-uuid.cmake")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
 # build the base kit first
 add_subdirectory(basekit)
 
 if (NOT ANDROID)
 add_subdirectory(logging)
-else()
-include("android-uuid.cmake")
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
 # network utils

src/infrastructure/android-uuid.cmake

@@ -36,6 +36,7 @@ if(NOT TARGET uuid)
   add_library(uuid STATIC ${SOURCE_FILES})
   # 为特定目标添加编译选项
   target_compile_options(uuid PRIVATE -fdeclspec)
+  target_include_directories(uuid PUBLIC "${UUID_DIR}/..")
 
   # Module folder
   set_target_properties(uuid PROPERTIES FOLDER "modules/uuid")