[Android] Fix release build

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Jan 27 15:41:41 2020 +0100| [f74e838ddac8b9b4e0ca2f63ccdb6514c2d46437] | committer: Geoffrey Métais

Fix release build

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

 api/src/main/AndroidManifest.xml                                        | 2 +-
 application/app/build.gradle                                            | 1 +
 application/resources/build.gradle                                      | 2 +-
 application/{television/src/main => vlc-android}/res/layout/tv_time.xml | 0
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml
index fd082a431..addda712b 100644
--- a/api/src/main/AndroidManifest.xml
+++ b/api/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.videolan.vlc.plugin.api">
 
-    <application android:label="@string/app_name"
+    <application 
         android:supportsRtl="true">
 
       <activity android:name="org.videolan.vlc.extensions.api.WarningActivity"
diff --git a/application/app/build.gradle b/application/app/build.gradle
index c7d749e74..f17dd2e9f 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -70,6 +70,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             kotlinOptions.freeCompilerArgs = ['-Xno-param-assertions']
+            multiDexEnabled true
         }
         signedRelease {
             initWith release
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index 0f4ba383a..2a1bf3e40 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -11,7 +11,7 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField "String", "APP_ID", rootProject.ext.appId
+        buildConfigField "String", "APP_ID", "\"rootProject.ext.appId\""
     }
 
     buildTypes {
diff --git a/application/television/src/main/res/layout/tv_time.xml b/application/vlc-android/res/layout/tv_time.xml
similarity index 100%
rename from application/television/src/main/res/layout/tv_time.xml
rename to application/vlc-android/res/layout/tv_time.xml