tools: remove cmake dependency hack

zx2c4 · zx2c4 · commit f360034f29be · 2023-04-05T12:23:41.000+02:00
Signed-off-by: Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;
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)

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,15 @@ android {`
`32`	`32`	`release {`
`33`	`33`	`externalNativeBuild {`
`34`	`34`	`cmake {`
	`35`	`+ targets 'libwg-go.so', 'libwg.so', 'libwg-quick.so'`
`35`	`36`	`arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`	`debug {`
`40`	`41`	`externalNativeBuild {`
`41`	`42`	`cmake {`
	`43`	`+ targets 'libwg-go.so', 'libwg.so', 'libwg-quick.so'`
`42`	`44`	`arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,3 @@ add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib`
`28`	`28`	`DESTDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}`
`29`	`29`	`BUILDDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../generated-src`
`30`	`30`	`)`
`31`		`-# Hack to make it actually build as part of the default target`
`32`		`-add_dependencies(libwg.so libwg-go.so)`