Skip to content

Commit 3665471

Browse files
committed
fix: cmake hash validation
1 parent 110684a commit 3665471

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

native/cmake/skia.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,17 @@ endforeach ()
6464
message(STATUS "Downloading Skia from ${ASSET_URL} with hash ${ASSET_HASH}")
6565

6666
set(SKIA_URL "${ASSET_URL}")
67-
string(REPLACE ":" "=" ASSET_HASH "${ASSET_HASH}")
67+
string(REGEX REPLACE ":.*" "" ASSET_HASH_ALGO "${ASSET_HASH}")
68+
string(REGEX REPLACE ".*:" "" ASSET_HASH_VALUE "${ASSET_HASH}")
69+
string(TOUPPER "${ASSET_HASH_ALGO}" ASSET_HASH_ALGO)
6870

6971
if (NOT ASSET_HASH)
7072
message(WARNING "Failed to find Skia hash, just checking for the files existence to determine if we need to download Skia again.")
7173
if (NOT EXISTS "${CMAKE_BINARY_DIR}/download/${ASSET_NAME}")
7274
file(DOWNLOAD ${SKIA_URL} "${CMAKE_BINARY_DIR}/download/${ASSET_NAME}" STATUS SKIA_DOWNLOAD_STATUS SHOW_PROGRESS)
7375
endif ()
7476
else ()
75-
file(DOWNLOAD ${SKIA_URL} "${CMAKE_BINARY_DIR}/download/${ASSET_NAME}" STATUS SKIA_DOWNLOAD_STATUS EXPECTED_HASH "${ASSET_HASH}" SHOW_PROGRESS)
77+
file(DOWNLOAD ${SKIA_URL} "${CMAKE_BINARY_DIR}/download/${ASSET_NAME}" STATUS SKIA_DOWNLOAD_STATUS EXPECTED_HASH "${ASSET_HASH_ALGO}=${ASSET_HASH_VALUE}" SHOW_PROGRESS)
7678
endif ()
7779

7880
list(GET SKIA_DOWNLOAD_STATUS 0 SKIA_DOWNLOAD_STATUS_CODE)

0 commit comments

Comments
 (0)