Android: remove support for local/debug deployment

This removes the pre-dexed JAR files activated by the absence of the
bundled_jar_file CONFIG option, as versions of Android >= 5 no longer
support this deployment mechanism.

Now, the "bundled" JARs simply become normal JARs containing class
files, and are neither activated by a bundled_jar_file CONFIG entry nor
do they have a -bundled suffix in the file's base name.

Task-number: QTBUG-62995
Change-Id: Ib53cbfe1009aa7e37de109dc317a58968854bf59
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

5 files changed, 20 insertions, 28 deletions

diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 0f3f3ff6b..36ec1f789 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -67,8 +67,6 @@ include(recording/recording.pri)
 include(video/video.pri)
 
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils
-ANDROID_JAR_DEPENDENCIES = \
     jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils
 ANDROID_LIB_DEPENDENCIES = \
     plugins/mediaservice/libqtmedia_android.so \
diff --git a/src/plugins/android/jar/bundledjar.pro b/src/plugins/android/jar/bundledjar.pro
deleted file mode 100644
index cc76164a7..000000000
--- a/src/plugins/android/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = QtMultimedia-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)
diff --git a/src/plugins/android/jar/distributedjar.pro b/src/plugins/android/jar/distributedjar.pro
deleted file mode 100644
index 34724c197..000000000
--- a/src/plugins/android/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtMultimedia
-include(jar.pri)
diff --git a/src/plugins/android/jar/jar.pri b/src/plugins/android/jar/jar.pri
deleted file mode 100644
index 5408fb109..000000000
--- a/src/plugins/android/jar/jar.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-load(qt_build_paths)
-CONFIG += java
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \
-               $$PWD/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java \
-               $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java \
-               $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java \
-               $$PWD/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java \
-               $$PWD/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java \
-               $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
-
-OTHER_FILES += $$JAVASOURCES
diff --git a/src/plugins/android/jar/jar.pro b/src/plugins/android/jar/jar.pro
index 6a4fcd389..96e492f63 100644
--- a/src/plugins/android/jar/jar.pro
+++ b/src/plugins/android/jar/jar.pro
@@ -1,3 +1,21 @@
-TEMPLATE=subdirs
-SUBDIRS += distributedjar.pro bundledjar.pro
+TARGET = QtMultimedia
 
+load(qt_build_paths)
+CONFIG += java
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java \
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java \
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java \
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java \
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java \
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target
+
+OTHER_FILES += $$JAVASOURCES