diff --git a/Ladybird/Android/CMakeLists.txt b/Ladybird/Android/CMakeLists.txt index 7dae4749d99..115228792ce 100644 --- a/Ladybird/Android/CMakeLists.txt +++ b/Ladybird/Android/CMakeLists.txt @@ -9,5 +9,5 @@ add_library(ladybird SHARED ) target_link_libraries(ladybird PRIVATE LibArchive jnigraphics android) -include(Ladybird/cmake/AndroidExtras.cmake) +include(../cmake/AndroidExtras.cmake) create_ladybird_bundle(ladybird) diff --git a/Ladybird/Android/build.gradle.kts b/Ladybird/Android/build.gradle.kts index 4f5ecc91c06..cd0c7075c55 100644 --- a/Ladybird/Android/build.gradle.kts +++ b/Ladybird/Android/build.gradle.kts @@ -68,7 +68,7 @@ android { } externalNativeBuild { cmake { - path = file("../CMakeLists.txt") + path = file("../../CMakeLists.txt") version = "3.23.0+" } } diff --git a/Ladybird/cmake/AndroidExtras.cmake b/Ladybird/cmake/AndroidExtras.cmake index 5efbc38e329..73040ef0fb1 100644 --- a/Ladybird/cmake/AndroidExtras.cmake +++ b/Ladybird/cmake/AndroidExtras.cmake @@ -21,8 +21,6 @@ copy_res_folder(fonts) copy_res_folder(icons) copy_res_folder(emoji) copy_res_folder(themes) -copy_res_folder(color-palettes) -copy_res_folder(cursor-themes) add_custom_target(copy-autoplay-allowlist COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LADYBIRD_SOURCE_DIR}/Base/home/anon/.config/BrowserAutoplayAllowlist.txt" @@ -39,6 +37,6 @@ add_custom_target(copy-certs "asset-bundle/res/ladybird/cacert.pem" ) 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(ladybird copy-assets)