summaryrefslogtreecommitdiffhomepage
path: root/android/app
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2022-01-07 13:36:37 +0100
committerAlbin <albin@mullvad.net>2022-01-07 13:36:37 +0100
commitf2378ecc3f117adea0970f4c9b981fde22cb2899 (patch)
tree56af4ead0d17081f3c7389dcbe3ff2ee5bb9b040 /android/app
parentdc034b7030d615acea40e3272eaaa114b605c7d7 (diff)
downloadmullvadvpn-f2378ecc3f117adea0970f4c9b981fde22cb2899.tar.xz
mullvadvpn-f2378ecc3f117adea0970f4c9b981fde22cb2899.zip
Fix Android build asset inclusion
Diffstat (limited to 'android/app')
-rw-r--r--android/app/build.gradle.kts6
1 files changed, 2 insertions, 4 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index e7ea766c01..0785be6256 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -87,10 +87,8 @@ android {
// Opt-in option for Koin annotation of KoinComponent.
}
- applicationVariants.forEach { variant ->
- variant.mergeAssetsProvider.configure{
- dependsOn(task("copyExtraAssets"))
- }
+ tasks.withType<com.android.build.gradle.tasks.MergeSourceSetFolders> {
+ dependsOn(getTasksByName("copyExtraAssets", true))
}
testOptions {