T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android support (#4606)

Browse Source 
* Add android aarch64 support into c-api

* Remove target test and clean up CMake script c-api

* Deduplicate ExternalProject_Add in c-api Android support
This commit is contained in:
TheGreatRambler
2022-08-30 08:08:26 -06:00
committed by GitHub
parent 52d88facdd
commit e910b8fbfb
1 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
crates/c-api/CMakeLists.txt
View File

@@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.10)
option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
if (CMAKE_BUILD_TYPE STREQUAL "Release")
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(WASMTIME_BUILD_TYPE_FLAG "--release")
set(WASMTIME_BUILD_TYPE "release")
else()
set(WASMTIME_BUILD_TYPE "debug")
endif()
if (BUILD_SHARED_LIBS)
if(BUILD_SHARED_LIBS)
# Copy shared library into build directory
if(WIN32)
set(WASMTIME_INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -26,39 +26,100 @@ if (BUILD_SHARED_LIBS)
endif()
endif()
if(ANDROID)
# TODO wasmtime only supports arm64-v8a right now
if(ANDROID_ABI STREQUAL "armeabi-v7a")
set(ANDROID_TARGET "armv7-linux-androideabi")
set(ANDROID_ARCH_SHORT "arm")
elseif(ANDROID_ABI STREQUAL "arm64-v8a")
set(ANDROID_TARGET "aarch64-linux-android")
set(ANDROID_ARCH_SHORT "aarch64")
elseif(ANDROID_ABI STREQUAL "x86")
set(ANDROID_TARGET "i686-linux-android")
set(ANDROID_ARCH_SHORT "i386")
elseif(ANDROID_ABI STREQUAL "x86_64")
set(ANDROID_TARGET "x86_64-linux-android")
set(ANDROID_ARCH_SHORT "x86_64")
endif()
set(WASMTIME_BUILD_TARGET "--target=${ANDROID_TARGET}")
endif()
if (BUILD_SHARED_LIBS AND ANDROID)
message(FATAL_ERROR "Wasmtime cannot be built with BUILD_SHARED_LIBS on Android")
endif()
if(BUILD_SHARED_LIBS)
if(WIN32)
set(WASMTIME_BUILD_PRODUCT
${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/wasmtime.dll.lib)
elseif(APPLE)
set(WASMTIME_BUILD_PRODUCT
${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/libwasmtime.dylib)
else()
set(WASMTIME_BUILD_PRODUCT
${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/libwasmtime.so)
endif()
else()
if(WIN32)
set(WASMTIME_BUILD_PRODUCT
${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/wasmtime.lib)
elseif(ANDROID)
set(WASMTIME_BUILD_PRODUCT
${CMAKE_CURRENT_SOURCE_DIR}/../../target/${ANDROID_TARGET}/${WASMTIME_BUILD_TYPE}/libwasmtime.a)
else()
set(WASMTIME_BUILD_PRODUCT
${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/libwasmtime.a)
endif()
endif()
if(ANDROID)
# Rust attempts to use libgcc.a on NDK versions r23-beta3 and up
# but it has been replaced with libunwind.a (rust-lang/rust#85806)
file(WRITE ${CMAKE_BINARY_DIR}/libgcc.a "INPUT(-lunwind)")
# The version of the clang compiler is part of the libunwind.a path
file(STRINGS ${ANDROID_TOOLCHAIN_ROOT}/AndroidVersion.txt CLANG_VERSION_FILE)
list(GET CLANG_VERSION_FILE 0 CLANG_VERSION)
# Some crates use the compiler directly, environment variables
# are set to make them use the Android compiler
set(WASMTIME_PREBUILD_COMMAND ${CMAKE_COMMAND} -E env
CC=${ANDROID_TOOLCHAIN_ROOT}/bin/clang
AR=${ANDROID_TOOLCHAIN_ROOT}/bin/llvm-ar
"RUSTFLAGS=-L ${CMAKE_SYSROOT}/usr/lib/${ANDROID_TARGET}/${ANDROID_NATIVE_API_LEVEL} \
-L ${ANDROID_TOOLCHAIN_ROOT}/lib64/clang/${CLANG_VERSION}/lib/linux/${ANDROID_ARCH_SHORT} \
-L ${CMAKE_BINARY_DIR} -C linker=${ANDROID_TOOLCHAIN_ROOT}/bin/ld")
endif()
include(ExternalProject)
ExternalProject_Add(
wasmtime-crate
DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ""
INSTALL_COMMAND "${WASMTIME_INSTALL_COMMAND}"
BUILD_COMMAND cargo build ${WASMTIME_BUILD_TYPE_FLAG}
BUILD_COMMAND ${WASMTIME_PREBUILD_COMMAND} cargo build ${WASMTIME_BUILD_TYPE_FLAG} ${WASMTIME_BUILD_TARGET}
BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}
BUILD_ALWAYS ON)
BUILD_ALWAYS ON
BUILD_BYPRODUCTS ${WASMTIME_BUILD_PRODUCT})
add_library(wasmtime INTERFACE)
add_dependencies(wasmtime wasmtime-crate)
if (BUILD_SHARED_LIBS)
if(WIN32)
target_link_libraries(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/wasmtime.dll.lib)
elseif(APPLE)
target_link_libraries(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/libwasmtime.dylib)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
else()
target_link_libraries(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/libwasmtime.so)
if(BUILD_SHARED_LIBS)
if(NOT WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
endif()
target_link_libraries(wasmtime INTERFACE ${WASMTIME_BUILD_PRODUCT})
else()
if(WIN32)
target_compile_options(wasmtime INTERFACE -DWASM_API_EXTERN= -DWASI_API_EXTERN=)
target_link_libraries(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/wasmtime.lib
target_link_libraries(wasmtime INTERFACE ${WASMTIME_BUILD_PRODUCT}
ws2_32 advapi32 userenv ntdll shell32 ole32 bcrypt)
elseif(APPLE)
target_link_libraries(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/libwasmtime.a)
elseif(APPLE OR ANDROID)
target_link_libraries(wasmtime INTERFACE ${WASMTIME_BUILD_PRODUCT})
else()
target_link_libraries(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/${WASMTIME_BUILD_TYPE}/libwasmtime.a
target_link_libraries(wasmtime INTERFACE ${WASMTIME_BUILD_PRODUCT}
pthread dl m)
endif()
endif()
target_include_directories(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/include)
target_include_directories(wasmtime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/include)