From c379a7fa2788b82b230a5f9be4cedc93f3d3a6b7 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Thu, 1 Sep 2022 13:57:40 +0200
Subject: [PATCH] Fix Android packaging

In the AndroidManifest we specify 'neochat' as the executable

That causes the lib to be used instead of the executable, which breaks things

Shuffle around the names so that the executable is picked
---
 android/AndroidManifest.xml | 2 +-
 src/CMakeLists.txt          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 5d02c96c2..b475cc21f 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -21,7 +21,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
-            <meta-data android:name="android.app.lib_name" android:value="neochat"/>
+            <meta-data android:name="android.app.lib_name" android:value="neochat-app"/>
             <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
             <meta-data android:name="android.app.repository" android:value="default"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c027b827c..ad37bb48b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -144,7 +144,9 @@ else()
     install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()
 
-set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
+if(NOT ANDROID)
+    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
+endif()
 
 if(TARGET KF5::DBusAddons)
     target_link_libraries(neochat PUBLIC KF5::DBusAddons)