Skip to content

Commit 2e23b33

Browse files
committed
fix: android test compile and library load
1 parent a6afcce commit 2e23b33

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

bridge/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,20 @@ if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
364364
include(./test/test.cmake)
365365
endif ()
366366
367+
# Android integration tests also need the test bridge exports, but they do not
368+
# build the desktop-only unit test targets from test.cmake.
369+
if (IS_ANDROID AND ENABLE_TEST)
370+
add_compile_definitions(IS_TEST=true)
371+
target_sources(webf PRIVATE
372+
include/webf_bridge_test.h
373+
webf_bridge_test.cc
374+
./test/test_framework_polyfill.c
375+
test/webf_test_context.cc
376+
test/webf_test_context.h
377+
)
378+
target_include_directories(webf PRIVATE ./test)
379+
endif ()
380+
367381
#if(CMAKE_SYSTEM_NAME MATCHES "MSYS" OR MINGW)
368382
# install(TARGETS webf
369383
# LIBRARY DESTINATION lib # For Unix-like OSes

webf/android/src/main/java/com/openwebf/webf/WebFPlugin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ private static void loadLibrary() {
4747
}
4848
// Loads `libwebf.so`.
4949
System.loadLibrary("webf");
50-
// Loads `libquickjs.so`.
51-
System.loadLibrary("quickjs");
5250
isLibraryLoaded = true;
5351
}
5452

0 commit comments

Comments
 (0)