beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Android: Update various file paths in CMake

Browse source 
It looks like some things have moved around since the last time the
Android build worked. So, update the incorrect paths to point to where
they should.
This commit is contained in:
Alex Studer 2024-07-03 15:31:48 -04:00 committed by Andrew Kaster
parent 1d0de0b450
commit d1788a7a02
Notes: sideshowbarker 2024-07-17 01:00:06 +09:00 
Author: https://github.com/thatoddmailbox
Commit: https://github.com/LadybirdBrowser/ladybird/commit/d1788a7a02
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/402
Issue: https://github.com/LadybirdBrowser/ladybird/issues/220
Reviewed-by: https://github.com/ADKaster ✅
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ladybird/Android/CMakeLists.txt
View file

@ -9,5 +9,5 @@ add_library(ladybird SHARED
) )
target_link_libraries(ladybird PRIVATE LibArchive jnigraphics android) target_link_libraries(ladybird PRIVATE LibArchive jnigraphics android)
include(Ladybird/cmake/AndroidExtras.cmake) include(../cmake/AndroidExtras.cmake)
create_ladybird_bundle(ladybird) create_ladybird_bundle(ladybird)

2
Ladybird/Android/build.gradle.kts
View file

@ -68,7 +68,7 @@ android {
} }
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path = file("../CMakeLists.txt") path = file("../../CMakeLists.txt")
version = "3.23.0+" version = "3.23.0+"
} }
} }

4
Ladybird/cmake/AndroidExtras.cmake
View file

@ -21,8 +21,6 @@ copy_res_folder(fonts)
copy_res_folder(icons) copy_res_folder(icons)
copy_res_folder(emoji) copy_res_folder(emoji)
copy_res_folder(themes) copy_res_folder(themes)
copy_res_folder(color-palettes)
copy_res_folder(cursor-themes)
add_custom_target(copy-autoplay-allowlist add_custom_target(copy-autoplay-allowlist
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${LADYBIRD_SOURCE_DIR}/Base/home/anon/.config/BrowserAutoplayAllowlist.txt" "${LADYBIRD_SOURCE_DIR}/Base/home/anon/.config/BrowserAutoplayAllowlist.txt"
@ -39,6 +37,6 @@ add_custom_target(copy-certs
"asset-bundle/res/ladybird/cacert.pem" "asset-bundle/res/ladybird/cacert.pem"
) )
add_dependencies(archive-assets copy-autoplay-allowlist copy-content-filters copy-certs) add_dependencies(archive-assets copy-autoplay-allowlist copy-content-filters copy-certs)
add_custom_target(copy-assets COMMAND ${CMAKE_COMMAND} -E copy_if_different ladybird-assets.tar.gz "${CMAKE_SOURCE_DIR}/Android/src/main/assets/") add_custom_target(copy-assets COMMAND ${CMAKE_COMMAND} -E copy_if_different ladybird-assets.tar.gz "${CMAKE_SOURCE_DIR}/Ladybird/Android/src/main/assets/")
add_dependencies(copy-assets archive-assets) add_dependencies(copy-assets archive-assets)
add_dependencies(ladybird copy-assets) add_dependencies(ladybird copy-assets)