From a18edb46affc4bd2cab8be9baf0d76f3d011bda7 Mon Sep 17 00:00:00 2001
From: Paul Harrison <pharrison@mythtv.org>
Date: Sat, 1 Dec 2018 23:43:58 +0000
Subject: [PATCH] android: add mythplugin to the name of the plugin .so files

---
 mythplugins/mytharchive/mytharchive/mytharchive.pro          | 5 +++++
 mythplugins/mythbrowser/mythbrowser/mythbrowser.pro          | 5 +++++
 mythplugins/mythgallery/mythgallery/mythgallery.pro          | 5 +++++
 mythplugins/mythgame/mythgame/mythgame.pro                   | 5 +++++
 mythplugins/mythmusic/mythmusic/mythmusic.pro                | 5 +++++
 mythplugins/mythnetvision/mythnetvision/mythnetvision.pro    | 5 +++++
 mythplugins/mythnews/mythnews/mythnews.pro                   | 5 +++++
 mythplugins/mythweather/mythweather/mythweather.pro          | 5 +++++
 mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro | 5 +++++
 9 files changed, 45 insertions(+)

diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.pro b/mythplugins/mytharchive/mytharchive/mytharchive.pro
index 7bead1c0efc..a9cea7f1746 100644
--- a/mythplugins/mytharchive/mytharchive/mytharchive.pro
+++ b/mythplugins/mytharchive/mytharchive/mytharchive.pro
@@ -75,4 +75,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
index 46d55892375..2f0b5b90147 100644
--- a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
+++ b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
@@ -29,4 +29,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythgallery/mythgallery/mythgallery.pro b/mythplugins/mythgallery/mythgallery/mythgallery.pro
index f009cc05d8c..52a65784f67 100644
--- a/mythplugins/mythgallery/mythgallery/mythgallery.pro
+++ b/mythplugins/mythgallery/mythgallery/mythgallery.pro
@@ -46,4 +46,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythgame/mythgame/mythgame.pro b/mythplugins/mythgame/mythgame/mythgame.pro
index 1601e9b1a54..5a91fa4a8ab 100644
--- a/mythplugins/mythgame/mythgame/mythgame.pro
+++ b/mythplugins/mythgame/mythgame/mythgame.pro
@@ -37,4 +37,9 @@ LIBS += -lz -lminizip
 #The following line was inserted by qt3to4
 QT += xml sql opengl network
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.pro b/mythplugins/mythmusic/mythmusic/mythmusic.pro
index 2f8b1531791..09018ace7e5 100644
--- a/mythplugins/mythmusic/mythmusic/mythmusic.pro
+++ b/mythplugins/mythmusic/mythmusic/mythmusic.pro
@@ -86,4 +86,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS_SHLIB += -fvisibility=hidden
 }
 
+android {
+    # to discriminate filters in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
index eace2bdafaa..dc93c03da2d 100644
--- a/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
+++ b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
@@ -40,4 +40,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythnews/mythnews/mythnews.pro b/mythplugins/mythnews/mythnews/mythnews.pro
index 8da7aefdeab..70f81ed4d2e 100644
--- a/mythplugins/mythnews/mythnews/mythnews.pro
+++ b/mythplugins/mythnews/mythnews/mythnews.pro
@@ -34,4 +34,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythweather/mythweather/mythweather.pro b/mythplugins/mythweather/mythweather/mythweather.pro
index ded1f00909b..af44d914d7a 100644
--- a/mythplugins/mythweather/mythweather/mythweather.pro
+++ b/mythplugins/mythweather/mythweather/mythweather.pro
@@ -33,4 +33,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )
diff --git a/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro b/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
index 07ffad8b71f..f39e1648f04 100644
--- a/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
+++ b/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
@@ -27,4 +27,9 @@ use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
+android {
+    # to discriminate plugins in a flat directory structure
+    TARGET = mythplugin$${TARGET}
+}
+
 include ( ../../libs-targetfix.pro )