[Android] Force activity and service packages to avoid manifest merger issues

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Mon May  4 13:28:54 2020 +0200| [98f3f90b7a62176f060a8084c522c64ed4911953] | committer: Nicolas Pomepuy

Force activity and service packages to avoid manifest merger issues

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

 application/app/flavors/release/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/app/flavors/release/AndroidManifest.xml b/application/app/flavors/release/AndroidManifest.xml
index 95b60332d..58a84a79e 100644
--- a/application/app/flavors/release/AndroidManifest.xml
+++ b/application/app/flavors/release/AndroidManifest.xml
@@ -43,10 +43,10 @@
     <uses-permission android:name="org.videolan.vlc.permission.BIND_DATA_CONSUMER" />
 
     <application>
-        <activity android:name=".gui.DebugLogActivity"
+        <activity android:name="${applicationId}.gui.DebugLogActivity"
             android:theme="@style/Theme.VLC"
             android:launchMode="singleTop" />
-        <service android:name=".DebugLogService"
+        <service android:name="${applicationId}.DebugLogService"
             android:process=":logger" />
     </application>