Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Checks:
-hicpp-move-const-arg,
llvm-*,
-llvm-header-guard
WarningsAsErrors: '*'
WarningsAsErrors: ''
HeaderFilterRegex: '(Browser|Common|JNI)/[^/]+\.h$'
AnalyzeTemporaryDtors: false
FormatStyle: file
Expand Down
9 changes: 8 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ plugins {
}

tasks.register("clean", Delete) {
delete rootProject.layout.buildDirectory
def buildDir = rootProject.layout.buildDirectory.get().asFile
if (buildDir.exists()) {
buildDir.eachFile { file ->
if (file.name != "cerbero" && file.name != "sysroot") {
delete file
}
}
}
delete file(".git/hooks/pre-commit")
}

Expand Down
1 change: 1 addition & 0 deletions tools/scripts/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ class Bootstrap:
("wpe-1.0", "wpe"),
("wpe-android", "wpe-android"),
("wpe-webkit-2.0", "wpe-webkit"),
("wpe-webkit-2.0/wpe-platform", "wpe-platform"),
("xkbcommon", "xkbcommon")
]
_soname_replacements = [
Expand Down
20 changes: 13 additions & 7 deletions wpeview/src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ set_target_properties(soup-3.0 PROPERTIES IMPORTED_LOCATION
add_library(WPEWebKit-2.0 SHARED IMPORTED)
set_target_properties(
WPEWebKit-2.0
PROPERTIES IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/imported/lib/${ANDROID_ABI}/libWPEWebKit-2.0.so"
INTERFACE_INCLUDE_DIRECTORIES
"${CMAKE_SOURCE_DIR}/imported/include/wpe-webkit;${CMAKE_SOURCE_DIR}/imported/include/libsoup-3.0")
PROPERTIES
IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/imported/lib/${ANDROID_ABI}/libWPEWebKit-2.0.so"
INTERFACE_INCLUDE_DIRECTORIES
"${CMAKE_SOURCE_DIR}/imported/include/wpe-webkit;${CMAKE_SOURCE_DIR}/imported/include/wpe-platform;${CMAKE_SOURCE_DIR}/imported/include;${CMAKE_SOURCE_DIR}/imported/include/libsoup-3.0"
)

add_library(libwpe-1.0 SHARED IMPORTED)
set_target_properties(
Expand Down Expand Up @@ -109,6 +111,7 @@ target_link_libraries(
${android-lib}
${log-lib}
${sync-lib}
gio-2.0
glib-2.0
gobject-2.0
gstreamer-1.0
Expand All @@ -120,7 +123,6 @@ add_library(
WPEAndroidRuntime SHARED
Runtime/EntryPoint.cpp
Runtime/Fence.cpp
Runtime/InputMethodContext.cpp
Runtime/LooperThread.cpp
Runtime/MessagePump.cpp
Runtime/RendererSurfaceControl.cpp
Expand All @@ -132,9 +134,14 @@ add_library(
Runtime/WKWebContext.cpp
Runtime/WKSettings.cpp
Runtime/WKWebsiteDataManager.cpp
Runtime/WKWebView.cpp)
Runtime/WKWebView.cpp
Runtime/WPEViewAndroid.cpp
Common/WPEDisplayAndroid.cpp
Common/WPEInputMethodContextAndroid.cpp
Common/WPEToplevelAndroid.cpp)
target_configure_quality(WPEAndroidRuntime)
target_compile_definitions(WPEAndroidRuntime PRIVATE WPE_ENABLE_PROCESS)
target_include_directories(WPEAndroidRuntime PRIVATE Runtime Common)
target_link_libraries(
WPEAndroidRuntime
EGL
Expand All @@ -144,7 +151,6 @@ target_link_libraries(
gobject-2.0
libwpe-1.0
soup-3.0
WPEBackend
WPEWebKit-2.0
WPEAndroidCommon)

Expand All @@ -156,7 +162,7 @@ target_link_libraries(
gio-2.0
glib-2.0
gmodule-2.0
WPEBackend
WPEWebKit-2.0
WPEAndroidRuntime
WPEAndroidCommon
WPEWebDriver)
Loading
Loading