diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-12 10:35:15 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-12 10:35:15 +0200 |
| commit | 07274dba0b01d4984e9e7d2991e6b9f684da52ab (patch) | |
| tree | a250a259e10b34daef1c220e21a3e0c15c769188 /android/test | |
| parent | e99c195e78a7991cb9eec3d00da05acb5416ca24 (diff) | |
| parent | 76a8f54a4a506c9a4a227169ee0e7c5a295384e9 (diff) | |
| download | mullvadvpn-07274dba0b01d4984e9e7d2991e6b9f684da52ab.tar.xz mullvadvpn-07274dba0b01d4984e9e7d2991e6b9f684da52ab.zip | |
Merge branch 'fix-warnings-with-app-variants-droid-2170'
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/baselineprofile/build.gradle.kts | 1 | ||||
| -rw-r--r-- | android/test/e2e/build.gradle.kts | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/android/test/baselineprofile/build.gradle.kts b/android/test/baselineprofile/build.gradle.kts index 6477b5adca..c7216bd9c5 100644 --- a/android/test/baselineprofile/build.gradle.kts +++ b/android/test/baselineprofile/build.gradle.kts @@ -86,6 +86,7 @@ dependencies { } androidComponents { + beforeVariants { it.enable = Variant(it.buildType, it.productFlavors).matches(baselineFilter) } onVariants { v -> val artifactsLoader = v.artifacts.getBuiltArtifactsLoader() v.instrumentationRunnerArguments.put( diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index 5fe61b878f..d4ee050a06 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -1,4 +1,3 @@ -import org.gradle.internal.extensions.stdlib.capitalized import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { @@ -94,13 +93,8 @@ android { androidComponents { beforeVariants { variantBuilder -> variantBuilder.enable = - variantBuilder.let { currentVariant -> - val enabledVariants = - enabledE2eVariantTriples.map { (billing, infra, buildType) -> - billing + infra.capitalized() + buildType.capitalized() - } - enabledVariants.contains(currentVariant.name) - } + Variant(variantBuilder.buildType, variantBuilder.productFlavors) + .matchesAny(ossProdDebug, playStagemoleDebug) } } |