From 25605f999e92a4dde6d0abb608012ffcfe120037 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 17 Oct 2019 10:22:41 +0200 Subject: [PATCH] Fixed debug flavor file provider preventing to have both a debug & release version installed at the same time --- app/build.gradle | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c23a15e72..8fece5158 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,14 +93,20 @@ android { versionName "${project.version}" applicationId getPackageName() multiDexEnabled true - manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address", - linphone_file_provider: getPackageName() + ".provider"] } applicationVariants.all { variant -> variant.outputs.all { outputFileName = "linphone-android-${variant.buildType.name}-${project.version}.apk" } + + if (variant.buildType.name.equals("release")) { + variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address", + linphone_file_provider: getPackageName() + ".provider"] + } else { + variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address", + linphone_file_provider: getPackageName() + ".debug.provider"] + } } def keystorePropertiesFile = rootProject.file("keystore.properties") @@ -136,7 +142,7 @@ android { jniDebuggable true resValue "string", "sync_account_type", getPackageName() + ".sync" - resValue "string", "file_provider", getPackageName() + ".provider" + resValue "string", "file_provider", getPackageName() + ".debug.provider" resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address" if (!firebaseEnabled()) {