diff --git a/android/gltfio-android/CMakeLists.txt b/android/gltfio-android/CMakeLists.txt index 5617d18a49..ba30cb7a10 100644 --- a/android/gltfio-android/CMakeLists.txt +++ b/android/gltfio-android/CMakeLists.txt @@ -42,6 +42,14 @@ add_library(gltfio_resources SHARED IMPORTED) set_target_properties(gltfio_resources PROPERTIES IMPORTED_LOCATION ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libgltfio_resources.a) +add_library(bluevk SHARED IMPORTED) +set_target_properties(bluevk PROPERTIES IMPORTED_LOCATION + ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libbluevk.a) + +add_library(smol-v SHARED IMPORTED) +set_target_properties(smol-v PROPERTIES IMPORTED_LOCATION + ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libsmol-v.a) + include_directories(${FILAMENT_DIR}/include .. ../../libs/utils/include) @@ -87,3 +95,7 @@ target_link_libraries(gltfio-jni m log ) + +if (FILAMENT_SUPPORTS_VULKAN) + target_link_libraries(gltfio-jni bluevk smol-v) +endif() diff --git a/build.sh b/build.sh index 6feeaaf993..3892e3b011 100755 --- a/build.sh +++ b/build.sh @@ -415,7 +415,8 @@ function build_android { cd android/gltfio-android if [[ "$ISSUE_DEBUG_BUILD" == "true" ]]; then - ./gradlew -Pfilament_dist_dir=../../out/android-debug/filament assembleDebug + ./gradlew -Pfilament_dist_dir=../../out/android-debug/filament assembleDebug \ + -Pextra_cmake_args=${VULKAN_ANDROID_OPTION} if [[ "$INSTALL_COMMAND" ]]; then echo "Installing out/gltfio-android-debug.aar..." @@ -424,7 +425,8 @@ function build_android { fi if [[ "$ISSUE_RELEASE_BUILD" == "true" ]]; then - ./gradlew -Pfilament_dist_dir=../../out/android-release/filament assembleRelease + ./gradlew -Pfilament_dist_dir=../../out/android-release/filament assembleRelease \ + -Pextra_cmake_args=${VULKAN_ANDROID_OPTION} if [[ "$INSTALL_COMMAND" ]]; then echo "Installing out/gltfio-android-release.aar..."