[Android] Enable R8 & multidex debug builds only

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Jun 26 10:01:17 2019 +0200| [f48308ee0e73ef9ae132357f225001274f12b725] | committer: Geoffrey Métais

Enable R8 & multidex debug builds only

> https://code.videolan.org/videolan/vlc-android/commit/f48308ee0e73ef9ae132357f225001274f12b725
---

 gradle.properties        | 1 -
 vlc-android/build.gradle | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 675163e55..e379606f1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=false
 android.databinding.incremental=true
 kapt.incremental.apt=true
 kapt.use.worker.api=true
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index e91f98cd9..02d743e80 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -64,7 +64,6 @@ android {
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         vectorDrawables.useSupportLibrary = true
-        multiDexEnabled true
 
         tasks.whenTaskAdded { task ->
             if (task.name.startsWith('merge')) {
@@ -127,6 +126,7 @@ android {
         debug {
             applicationIdSuffix ".debug"
             jniDebuggable true
+            multiDexEnabled true
         }
         dev {
             initWith debug