Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tunnel: fix package name being passed through to cmake

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-03-29 01:18:38 -06:00
parent 183273dcf5
commit 79e766c4e1
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tunnel/build.gradle
View File

@ -26,6 +26,22 @@ android {
events 'passed', 'skipped', 'failed', 'standardOut', 'standardError' 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 { dependencies {

10
ui/build.gradle
View File

@ -51,22 +51,12 @@ android {
buildTypes { buildTypes {
release { release {
if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
externalNativeBuild {
cmake {
arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}"
}
}
minifyEnabled true minifyEnabled true
proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro" proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro"
} }
debug { debug {
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
versionNameSuffix "-debug" versionNameSuffix "-debug"
externalNativeBuild {
cmake {
arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}${applicationIdSuffix}"
}
}
} }
} }
} }