From 4fbebd77c38c5e27404d2bcbcaa1a94ff540b4b7 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Mon, 4 Sep 2017 22:33:40 -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: I23fe81254efee5517453f73b1938026257ddb7a6
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/plugins/sensors/android/jar/bundledjar.pro     |  3 ---
 src/plugins/sensors/android/jar/distributedjar.pro |  2 --
 src/plugins/sensors/android/jar/jar.pri            | 13 -------------
 src/plugins/sensors/android/jar/jar.pro            | 16 ++++++++++++++--
 src/sensors/sensors.pro                            |  2 --
 5 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 src/plugins/sensors/android/jar/bundledjar.pro
 delete mode 100644 src/plugins/sensors/android/jar/distributedjar.pro
 delete mode 100644 src/plugins/sensors/android/jar/jar.pri

diff --git a/src/plugins/sensors/android/jar/bundledjar.pro b/src/plugins/sensors/android/jar/bundledjar.pro
deleted file mode 100644
index 2f6f195d..00000000
--- a/src/plugins/sensors/android/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = QtSensors-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)
diff --git a/src/plugins/sensors/android/jar/distributedjar.pro b/src/plugins/sensors/android/jar/distributedjar.pro
deleted file mode 100644
index 2099826a..00000000
--- a/src/plugins/sensors/android/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtSensors
-include(jar.pri)
diff --git a/src/plugins/sensors/android/jar/jar.pri b/src/plugins/sensors/android/jar/jar.pri
deleted file mode 100644
index 7e5916c8..00000000
--- a/src/plugins/sensors/android/jar/jar.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-load(qt_build_paths)
-
-CONFIG += java
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += \
-    $$PWD/src/org/qtproject/qt5/android/sensors/QtSensors.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
diff --git a/src/plugins/sensors/android/jar/jar.pro b/src/plugins/sensors/android/jar/jar.pro
index 70373fe1..1d5d4ae4 100644
--- a/src/plugins/sensors/android/jar/jar.pro
+++ b/src/plugins/sensors/android/jar/jar.pro
@@ -1,3 +1,15 @@
-TEMPLATE = subdirs
-SUBDIRS += bundledjar.pro distributedjar.pro
+TARGET = QtSensors
 
+load(qt_build_paths)
+
+CONFIG += java
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += \
+    $$PWD/src/org/qtproject/qt5/android/sensors/QtSensors.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index e66d427f..eaaa73fd 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -13,8 +13,6 @@ qtHaveModule(simulator) {
 QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf
 
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtSensors-bundled.jar:org.qtproject.qt5.android.sensors.QtSensors
-ANDROID_JAR_DEPENDENCIES = \
     jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors
 ANDROID_LIB_DEPENDENCIES = \
     plugins/sensors/libqtsensors_android.so
-- 
cgit v1.2.3