tools: remove cmake dependency hack

Signed-off-by: Jason A. Donenfeld <[email protected]>
WireGuard · Apr 5, 2023 · f360034 · f360034
1 parent 01e7206
commit f360034
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
@@ -32,13 +32,15 @@ android {
         release {
             externalNativeBuild {
                 cmake {
+                    targets 'libwg-go.so', 'libwg.so', 'libwg-quick.so'
                     arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
                 }
             }
         }
         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
@@ -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)