Skip to content

Commit

Permalink
Include correct header file
Browse files Browse the repository at this point in the history
  • Loading branch information
dzolnai committed Oct 11, 2023
1 parent 0fe61d0 commit 0760cc8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class WireGuardService(private val context: Context, timer: Flow<Unit>): VPNServ

private lateinit var backend : GoBackend

// If we don't run the Wireguard backend always on the same thread, it will crash randomly in native code.
// If we don't run the WireGuard backend always on the same thread, it will crash randomly in native code.
// So we confine it to the same background thread, and communicate with it via Coroutines.
private val backendDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()

Expand Down
4 changes: 2 additions & 2 deletions common/libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ string(REPLACE " -mthumb" "" CMAKE_CXX_FLAGS_NO_THUMB ${CMAKE_CXX_FLAGS})

# Compile from Go to C
add_custom_command(
OUTPUT ${INTERMEDIARY_FILE}
OUTPUT ${INTERMEDIARY_FILE} ${INTERMEDIARY_HEADER}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/eduvpn-common/exports"
COMMENT "Building shared library for ${ANDROID_LLVM_TRIPLE}"
VERBATIM
Expand All @@ -54,7 +54,7 @@ add_custom_command(
COMMAND cp ${INTERMEDIARY_FILE} ${OUTPUT_FILE}
)
# Set the output file on the target
add_custom_target(libeduvpn_common DEPENDS ${OUTPUT_FILE})
add_custom_target(libeduvpn_common DEPENDS ${OUTPUT_FILE} ${INTERMEDIARY_HEADER})
# Build the JNI code which will interface the common library to the shared code
add_library(eduvpn_common-wrapper SHARED
../src/main/cpp/jni.cpp ${INTERMEDIARY_HEADER}
Expand Down

0 comments on commit 0760cc8

Please sign in to comment.