Skip to content

Commit

Permalink
crashpad: fix android build
Browse files Browse the repository at this point in the history
  • Loading branch information
Chilledheart committed Dec 21, 2023
1 parent f61e80f commit 862ca9a
Showing 1 changed file with 17 additions and 4 deletions.
21 changes: 17 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2272,6 +2272,22 @@ if (IOS)
set(_CRASHPAD_OS "-ios-simulator")
set(_CRASHPAD_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
endif()
elseif (ANDROID)
set(_CRASHPAD_OS "-android")
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64-v8a")
set(_CRASHPAD_ARCH "arm64")
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armeabi-v7a")
set(_CRASHPAD_ARCH "arm")
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
set(_CRASHPAD_ARCH "x86")
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(_CRASHPAD_ARCH "x64")
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
set(_CRASHPAD_ARCH "riscv64")
else()
message(WARNING "crashpad: unsupported android architecture ${CMAKE_SYSTEM_PROCESSOR}")
set(_CRASHPAD_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
endif()
elseif (NOT OSX_CROSS_ARCHITECTURES_COUNT)
set(_CRASHPAD_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
elseif (OSX_CROSS_ARCHITECTURES_COUNT EQUAL 1)
Expand All @@ -2287,12 +2303,9 @@ elseif (_CRASHPAD_ARCH STREQUAL "i386" OR _CRASHPAD_ARCH STREQUAL "i586" OR _CRA
elseif (_CRASHPAD_ARCH STREQUAL "aarch64")
set(_CRASHPAD_ARCH "arm64")
endif()
if (ANDROID)
set(_CRASHPAD_OS "-android")
endif()
set(_CRASHPAD_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/third_party/crashpad/crashpad/out/Default-${_CRASHPAD_ARCH}${_CRASHPAD_OS}")
set(_CRASHPAD_BINARY_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/third_party/crashpad/crashpad/out/Binary-${_CRASHPAD_ARCH}${_CRASHPAD_OS}")
if ((${CMAKE_BUILD_TYPE} MATCHES MinSizeRel OR ${CMAKE_BUILD_TYPE} MATCHES Release) AND EXISTS "${_CRASHPAD_PREFIX}/obj/client/libclient.a")
if (UNIX AND (${CMAKE_BUILD_TYPE} MATCHES MinSizeRel OR ${CMAKE_BUILD_TYPE} MATCHES Release) AND EXISTS "${_CRASHPAD_PREFIX}/obj/client/libclient.a")
message(STATUS "Compiling with bundled crashpad client library")
add_library(crashpad_common STATIC IMPORTED)
set_property(TARGET crashpad_common PROPERTY
Expand Down

0 comments on commit 862ca9a

Please sign in to comment.