tunnel: fix package name being passed through to cmake

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

2 files changed, 16 insertions, 10 deletions

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index f306292c..2f5835c1 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -26,6 +26,22 @@ android {
             events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
         }
     }
+    buildTypes {
+        release {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DANDROID_PACKAGE_NAME=${groupName}"
+                }
+            }
+        }
+        debug {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug"
+                }
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/ui/build.gradle b/ui/build.gradle
index 2ebfc1af..d00f4d64 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -51,22 +51,12 @@ android {
     buildTypes {
         release {
             if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
-            externalNativeBuild {
-                cmake {
-                    arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}"
-                }
-            }
             minifyEnabled true
             proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro"
         }
         debug {
             applicationIdSuffix ".debug"
             versionNameSuffix "-debug"
-            externalNativeBuild {
-                cmake {
-                    arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}${applicationIdSuffix}"
-                }
-            }
         }
     }
 }