mirror of
https://github.com/RGBCube/serenity
synced 2025-07-29 10:37:34 +00:00
Ladybird: Make Android build work again, and tidy up files
We don't need the extra gradle files in our sources, the Qt CMake integration will generate suitable ones for us. Make sure that assets is always a folder, so that we can get the proper layout for the ladybird-assets.tar.gz and CMake doesn't create a gzip file with the name "assets". Fix up the AndroidPlatform file and make sure it's linked into all the applications that need it. Also make sure to copy all the application shared libraries into the ladybird APK so that when we make them into proper Services, the libs are already there.
This commit is contained in:
parent
7de4fb2947
commit
e02b2a7b9a
10 changed files with 58 additions and 137 deletions
|
@ -97,9 +97,7 @@ set(SOURCES
|
|||
main.cpp
|
||||
)
|
||||
|
||||
qt_add_executable(ladybird ${SOURCES}
|
||||
MANUAL_FINALIZATION
|
||||
)
|
||||
qt_add_executable(ladybird ${SOURCES})
|
||||
target_link_libraries(ladybird PRIVATE Qt::Core Qt::Gui Qt::Network Qt::Widgets LibCore LibFileSystem LibGfx LibGUI LibIPC LibJS LibMain LibWeb LibWebView LibSQL)
|
||||
|
||||
target_include_directories(ladybird PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
@ -128,6 +126,7 @@ set_target_properties(ladybird PROPERTIES
|
|||
|
||||
if (ANDROID)
|
||||
include(cmake/AndroidExtras.cmake)
|
||||
link_android_libs(headless-browser)
|
||||
endif()
|
||||
|
||||
add_custom_target(run${LADYBIRD_CUSTOM_TARGET_SUFFIX}
|
||||
|
@ -141,8 +140,6 @@ add_custom_target(debug${LADYBIRD_CUSTOM_TARGET_SUFFIX}
|
|||
USES_TERMINAL
|
||||
)
|
||||
|
||||
qt_finalize_executable(ladybird)
|
||||
|
||||
add_subdirectory(SQLServer)
|
||||
add_subdirectory(WebContent)
|
||||
add_subdirectory(WebDriver)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue