diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-04-05 12:20:46 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-04-05 12:23:41 +0200 |
| commit | f360034f29be498b7a790fde77b7ec161fde8ef8 (patch) | |
| tree | 6f98df14a7c30dc37f9680b7751964261644e2b7 | |
| parent | 01e72064d440036157bde5947fec23157beb8bfe (diff) | |
tools: remove cmake dependency hack
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | tunnel/build.gradle | 2 | ||||
| -rw-r--r-- | tunnel/tools/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tunnel/build.gradle b/tunnel/build.gradle index 9a5c6d63..023bc9ef 100644 --- a/tunnel/build.gradle +++ b/tunnel/build.gradle @@ -32,6 +32,7 @@ android { release { externalNativeBuild { cmake { + targets 'libwg-go.so', 'libwg.so', 'libwg-quick.so' arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}" } } @@ -39,6 +40,7 @@ android { debug { externalNativeBuild { cmake { + targets 'libwg-go.so', 'libwg.so', 'libwg-quick.so' arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}" } } diff --git a/tunnel/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt index a63d8335..577a8623 100644 --- a/tunnel/tools/CMakeLists.txt +++ b/tunnel/tools/CMakeLists.txt @@ -28,5 +28,3 @@ add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib DESTDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} BUILDDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../generated-src ) -# Hack to make it actually build as part of the default target -add_dependencies(libwg.so libwg-go.so) |