[Android] Fix test build

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu Jan 30 11:59:26 2020 +0100| [38f9e7949eb5f6fea2d10f3f5b753d432933d57e] | committer: Nicolas Pomepuy

Fix test build

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

 application/app/build.gradle             | 3 +--
 application/live-plot-graph/build.gradle | 7 +++----
 application/mediadb/build.gradle         | 3 +++
 application/moviepedia/build.gradle      | 5 +++++
 application/resources/build.gradle       | 4 ++++
 application/television/build.gradle      | 4 ++++
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/application/app/build.gradle b/application/app/build.gradle
index f17dd2e9f..870e7db3c 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -38,6 +38,7 @@ android {
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -70,7 +71,6 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             kotlinOptions.freeCompilerArgs = ['-Xno-param-assertions']
-            multiDexEnabled true
         }
         signedRelease {
             initWith release
@@ -80,7 +80,6 @@ android {
         debug {
             applicationIdSuffix ".debug"
             jniDebuggable true
-            multiDexEnabled true
         }
         dev {
             initWith debug
diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle
index 41c6e86cd..a80498d1c 100644
--- a/application/live-plot-graph/build.gradle
+++ b/application/live-plot-graph/build.gradle
@@ -28,7 +28,6 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
@@ -53,10 +52,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(':application:tools')
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
 
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle
index 1fc0c8dc7..ad2e2fa89 100644
--- a/application/mediadb/build.gradle
+++ b/application/mediadb/build.gradle
@@ -28,6 +28,9 @@ apply plugin: 'kotlin-kapt'
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    packagingOptions {
+        pickFirst '**/*.so'
+    }
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle
index ecf4a3868..c780bc3e6 100644
--- a/application/moviepedia/build.gradle
+++ b/application/moviepedia/build.gradle
@@ -10,6 +10,10 @@ android {
         enabled = true
     }
 
+    packagingOptions {
+        pickFirst '**/*.so'
+    }
+
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
@@ -19,6 +23,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
         buildConfigField "String", "MOVIEPEDIA_API_URL", "\"${getMoviepediaUrl(project)}\""
+        multiDexEnabled true
     }
 
     buildTypes {
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index 452fab95c..f6cd74797 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -5,6 +5,10 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    packagingOptions {
+        pickFirst '**/*.so'
+    }
+
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         versionCode 1
diff --git a/application/television/build.gradle b/application/television/build.gradle
index 4f35d05f6..d5d20bc92 100644
--- a/application/television/build.gradle
+++ b/application/television/build.gradle
@@ -5,6 +5,10 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    packagingOptions {
+        pickFirst '**/*.so'
+    }
+
     kotlinOptions.jvmTarget = "1.8"
 
     dataBinding {