From 33aded09c620de48dede6a8d086d3739a6b03f05 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 5 Apr 2023 13:50:48 +0200
Subject: [PATCH] tools: deduplicate cmake arguments

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 tunnel/build.gradle | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index 023bc9ef..894762c9 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -29,19 +29,25 @@ android {
         }
     }
     buildTypes {
-        release {
+        all {
             externalNativeBuild {
                 cmake {
                     targets 'libwg-go.so', 'libwg.so', 'libwg-quick.so'
-                    arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
+                    arguments "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
+                }
+            }
+        }
+        release {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DANDROID_PACKAGE_NAME=${groupName}"
                 }
             }
         }
         debug {
             externalNativeBuild {
                 cmake {
-                    targets 'libwg-go.so', 'libwg.so', 'libwg-quick.so'
-                    arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
+                    arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug"
                 }
             }
         }