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: I940eaf71a55c589b740489660f49ef30feb79cab
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

src/gamepad/gamepad.pro

@@ -27,9 +27,6 @@ SOURCES += \
 
 
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtAndroidGamepad-bundled.jar
-
-ANDROID_JAR_DEPENDENCIES = \
     jar/QtAndroidGamepad.jar
 
 ANDROID_LIB_DEPENDENCIES = \

src/plugins/gamepads/android/jar/bundledjar.pro

@@ -1,3 +0,0 @@
-TARGET = QtAndroidGamepad-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)

src/plugins/gamepads/android/jar/distributedjar.pro

@@ -1,2 +0,0 @@
-TARGET = QtAndroidGamepad
-include(jar.pri)

src/plugins/gamepads/android/jar/jar.pri

@@ -1,16 +0,0 @@
-load(qt_build_paths)
-CONFIG += java
-
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-API_VERSION = android-16
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/gamepad/QtGamepad.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
-
-OTHER_FILES += $$JAVASOURCES

src/plugins/gamepads/android/jar/jar.pro

@@ -1,2 +1,18 @@
-TEMPLATE=subdirs
+TARGET = QtAndroidGamepad
-SUBDIRS += distributedjar.pro bundledjar.pro
+
+load(qt_build_paths)
+CONFIG += java
+
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+API_VERSION = android-16
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/gamepad/QtGamepad.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target
+
+OTHER_FILES += $$JAVASOURCES