diff options
| -rw-r--r-- | kokoro/android/build.sh | 17 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kokoro/android/build.sh b/kokoro/android/build.sh index 0a03327..cedf268 100644 --- a/kokoro/android/build.sh +++ b/kokoro/android/build.sh @@ -18,19 +18,19 @@ set -x # Display commands as run BUILD_ROOT=$PWD SRC=$PWD/github/amber BUILD_TYPE=Release -TARGET_ARCH="armeabi-v7a with NEON" -TARGET_API="android-14" + export ANDROID_NDK=/opt/android-ndk-r15c +ANDROID_STL=c++_static +ANDROID_PLATFORM="android-14" +ANDROID_ABI="armeabi-v7a with NEON" + +TOOLCHAIN_PATH=$ANDROID_NDK/build/cmake/android.toolchain.cmake # Get NINJA. wget -q https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip unzip -q ninja-linux.zip export PATH="$PWD:$PATH" -# Get Android CMake -git clone --depth=1 https://github.com/taka-no-me/android-cmake.git android-cmake -export TOOLCHAIN_PATH=$PWD/android-cmake/android.toolchain.cmake - cd $SRC ./tools/git-sync-deps @@ -41,9 +41,10 @@ BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT} echo $(date): Starting build... cmake -GNinja \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ - -DANDROID_NATIVE_API_LEVEL=$TARGET_API \ - -DANDROID_ABI=$TARGET_ARCH \ + -DANDROID_ABI=$ANDROID_ABI \ + -DANDROID_PLATFORM=$ANDROID_PLATFORM \ -DANDROID_NDK=$ANDROID_NDK \ + -DANDROID_STL=$ANDROID_STL \ -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_PATH \ .. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2a5809e..cd12b15 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,10 +55,9 @@ endif() add_library(libamber ${AMBER_SOURCES}) amber_default_compile_options(libamber) set_target_properties(libamber PROPERTIES OUTPUT_NAME "amber") -# TODO(dsinclair): Remove pthread when building on windows. target_link_libraries(libamber SPIRV-Tools shaderc SPIRV) -if (NOT MSVC) - target_link_libraries(libamber pthread) +if (NOT MSVC AND NOT ANDROID) + target_link_libraries(libamber pthread) endif() if (${Vulkan_FOUND}) |