From 614a535f4259312834128b27e07fa70eaeb1ea88 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Mon, 4 Sep 2017 22:14:38 -0700
Subject: 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                             |  3 ---
 src/plugins/gamepads/android/jar/bundledjar.pro     |  3 ---
 src/plugins/gamepads/android/jar/distributedjar.pro |  2 --
 src/plugins/gamepads/android/jar/jar.pri            | 16 ----------------
 src/plugins/gamepads/android/jar/jar.pro            | 20 ++++++++++++++++++--
 5 files changed, 18 insertions(+), 26 deletions(-)
 delete mode 100644 src/plugins/gamepads/android/jar/bundledjar.pro
 delete mode 100644 src/plugins/gamepads/android/jar/distributedjar.pro
 delete mode 100644 src/plugins/gamepads/android/jar/jar.pri

(limited to 'src')

diff --git a/src/gamepad/gamepad.pro b/src/gamepad/gamepad.pro
index 92d68cc..ceb45df 100644
--- a/src/gamepad/gamepad.pro
+++ b/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 = \
diff --git a/src/plugins/gamepads/android/jar/bundledjar.pro b/src/plugins/gamepads/android/jar/bundledjar.pro
deleted file mode 100644
index 65af1bb..0000000
--- a/src/plugins/gamepads/android/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = QtAndroidGamepad-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)
diff --git a/src/plugins/gamepads/android/jar/distributedjar.pro b/src/plugins/gamepads/android/jar/distributedjar.pro
deleted file mode 100644
index d34c90c..0000000
--- a/src/plugins/gamepads/android/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtAndroidGamepad
-include(jar.pri)
diff --git a/src/plugins/gamepads/android/jar/jar.pri b/src/plugins/gamepads/android/jar/jar.pri
deleted file mode 100644
index 13d36ac..0000000
--- a/src/plugins/gamepads/android/jar/jar.pri
+++ /dev/null
@@ -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
diff --git a/src/plugins/gamepads/android/jar/jar.pro b/src/plugins/gamepads/android/jar/jar.pro
index 923e757..947a887 100644
--- a/src/plugins/gamepads/android/jar/jar.pro
+++ b/src/plugins/gamepads/android/jar/jar.pro
@@ -1,2 +1,18 @@
-TEMPLATE=subdirs
-SUBDIRS += distributedjar.pro bundledjar.pro
+TARGET = QtAndroidGamepad
+
+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
-- 
cgit v1.2.3