Uzuy-Mali/Uzuy
1
0
Fork 0
mirror of https://git.uzuy-edge.org/Uzuy-Mali/Uzuy.git synced 2024-11-26 23:40:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: comment out Android VVL download and extraction steps

Browse Source 
Commented out the VVL download and extraction logic in CMake since I'm now providing my own Vulkan Validation Layers binaries.
This commit is contained in:
Phoenix 2024-08-31 18:50:24 +10:00
parent 64debd2cda
commit a95d30dba9
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@ -82,23 +82,23 @@ if (ANDROID OR WIN32 OR APPLE)
endif()
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
if (ANDROID AND UZUY_DOWNLOAD_ANDROID_VVL)
set(vvl_version "sdk-1.3.261.1")
set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
if (NOT EXISTS "${vvl_zip_file}")
# Download and extract validation layer release to externals directory
set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-${vvl_version}-android.zip"
"${vvl_zip_file}" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
endif()
# if (ANDROID AND UZUY_DOWNLOAD_ANDROID_VVL)
# set(vvl_version "sdk-1.3.261.1")
# set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
# if (NOT EXISTS "${vvl_zip_file}")
# # Download and extract validation layer release to externals directory
# set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
# file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-${vvl_version}-android.zip"
# "${vvl_zip_file}" SHOW_PROGRESS)
# execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
# WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
# endif()
# Copy the arm64 binary to src/android/app/main/jniLibs
set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/")
file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
DESTINATION "${vvl_lib_path}")
endif()
# # Copy the arm64 binary to src/android/app/main/jniLibs
# set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/")
# file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
# DESTINATION "${vvl_lib_path}")
# endif()
if (ANDROID)
set(CMAKE_SKIP_INSTALL_RULES ON)