From f360034f29be498b7a790fde77b7ec161fde8ef8 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 5 Apr 2023 12:20:46 +0200
Subject: tools: remove cmake dependency hack

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 tunnel/build.gradle         | 2 ++
 tunnel/tools/CMakeLists.txt | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tunnel')

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)
-- 
cgit v1.2.3