aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2017-09-06 14:11:03 +0300
committerJake Petroules <jake.petroules@qt.io>2017-09-06 20:32:50 +0000
commit4d5368ab4fddee4439c808be2b4d56f5fd2dd271 (patch)
tree4d6ac11b0c9f6e457da1b4ba0178416eedc3dbce /src
parent0b48845e85e3bc6da8dd88b77dbe258877c64eed (diff)
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: Id370f03de61463bb3a8312d357374cf5c89fca69 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/androidextras/androidextras.pro2
-rw-r--r--src/jar/bundledjar.pro3
-rw-r--r--src/jar/distributedjar.pro2
-rw-r--r--src/jar/jar.pri14
-rw-r--r--src/jar/jar.pro19
5 files changed, 17 insertions, 23 deletions
diff --git a/src/androidextras/androidextras.pro b/src/androidextras/androidextras.pro
index 584c82e..132643d 100644
--- a/src/androidextras/androidextras.pro
+++ b/src/androidextras/androidextras.pro
@@ -9,8 +9,6 @@ include(jni/jni.pri)
include(android/android.pri)
ANDROID_BUNDLED_JAR_DEPENDENCIES = \
- jar/QtAndroidExtras-bundled.jar
-ANDROID_JAR_DEPENDENCIES = \
jar/QtAndroidExtras.jar
load(qt_module)
diff --git a/src/jar/bundledjar.pro b/src/jar/bundledjar.pro
deleted file mode 100644
index 9456e1c..0000000
--- a/src/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = QtAndroidExtras-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)
diff --git a/src/jar/distributedjar.pro b/src/jar/distributedjar.pro
deleted file mode 100644
index 714916b..0000000
--- a/src/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtAndroidExtras
-include(jar.pri)
diff --git a/src/jar/jar.pri b/src/jar/jar.pri
deleted file mode 100644
index 8ea4342..0000000
--- a/src/jar/jar.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-load(qt_build_paths)
-CONFIG += java
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java \
- $$PWD/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java \
- $$PWD/src/org/qtproject/qt5/android/extras/QtNative.java
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
-
-OTHER_FILES += $$JAVASOURCES
diff --git a/src/jar/jar.pro b/src/jar/jar.pro
index 6a4fcd3..a30922d 100644
--- a/src/jar/jar.pro
+++ b/src/jar/jar.pro
@@ -1,3 +1,18 @@
-TEMPLATE=subdirs
-SUBDIRS += distributedjar.pro bundledjar.pro
+TARGET = QtAndroidExtras
+load(qt_build_paths)
+CONFIG += java
+
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java \
+ $$PWD/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java \
+ $$PWD/src/org/qtproject/qt5/android/extras/QtNative.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target
+
+OTHER_FILES += $$JAVASOURCES