aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Mikhailov <nikita.s.mikhailov@gmail.com>2016-05-14 22:43:38 +0600
committerNikita Mikhailov <nikita.s.mikhailov@gmail.com>2016-05-17 01:21:29 +0600
commitbfa18dc79e2dc8016dc44eb8cd139d0fbb8d7c56 (patch)
tree76d93321bb8a1bd5b4ebbb65ba3d54ec04c5d106
parent664386afece0cfb4d6db214e786406b5ad632da7 (diff)
downloadopen-keychain-bfa18dc79e2dc8016dc44eb8cd139d0fbb8d7c56.tar.gz
open-keychain-bfa18dc79e2dc8016dc44eb8cd139d0fbb8d7c56.tar.bz2
open-keychain-bfa18dc79e2dc8016dc44eb8cd139d0fbb8d7c56.zip
Add new build type to mitigate debugging issues
-rw-r--r--OpenKeychain/build.gradle18
1 files changed, 11 insertions, 7 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 4d1b572aa..92746d563 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -190,9 +190,6 @@ android {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- // Enable code coverage (Jacoco)
- testCoverageEnabled true
-
applicationIdSuffix ".debug"
// Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE.
@@ -207,6 +204,13 @@ android {
buildConfigField "String", "GITHUB_CLIENT_ID", "\"c942cd81844d94e7e41b\""
buildConfigField "String", "GITHUB_CLIENT_SECRET", "\"f1dd17e70a0614abbd9310b00a310e23c6c8edff\""
}
+
+ // Workaround for http://stackoverflow.com/questions/27909613/cannot-see-parameter-value-in-android-studio-when-breakpoint-is-in-first-line-of
+ debugWithTestCoverage.initWith(debug)
+ debugWithTestCoverage {
+ // Enable code coverage (Jacoco)
+ testCoverageEnabled true
+ }
}
productFlavors {
@@ -285,12 +289,12 @@ android {
}
}
-task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugUnitTest") {
+task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugWithTestCoverageUnitTest") {
group = "Reporting"
description = "Generate Jacoco coverage reports"
classDirectories = fileTree(
- dir: "${buildDir}/intermediates/classes/debug",
+ dir: "${buildDir}/intermediates/classes/fdroid/debugWithTestCoverage",
excludes: ['**/R.class',
'**/R$*.class',
'**/*$ViewInjector*.*',
@@ -302,8 +306,8 @@ task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugUnitTest") {
sourceDirectories = files("${buildDir.parent}/src/main/java")
additionalSourceDirs = files([
- "${buildDir}/generated/source/buildConfig/debug",
- "${buildDir}/generated/source/r/debug"
+ "${buildDir}/generated/source/buildConfig/fdroid/debugWithTestCoverage",
+ "${buildDir}/generated/source/r/fdroid/debugWithTestCoverage"
])
executionData = fileTree(dir: "${buildDir}/jacoco", include: "**/*.exec")