From f48308ee0e73ef9ae132357f225001274f12b725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= <geoffrey.metais@gmail.com>
Date: Wed, 26 Jun 2019 10:01:17 +0200
Subject: [PATCH] Enable R8 & multidex debug builds only
---
gradle.properties | 1 -
vlc-android/build.gradle | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 675163e552..e379606f15 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 e91f98cd94..02d743e809 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
--
GitLab