diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-04 22:33:40 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 18:22:42 +0000 |
| commit | 4fbebd77c38c5e27404d2bcbcaa1a94ff540b4b7 (patch) | |
| tree | 2709aff35c0d6de590971b604235109b0e983251 /src/plugins | |
| parent | ccb803ae6072dee5b2312a9e6f578c6eff3aac42 (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: I23fe81254efee5517453f73b1938026257ddb7a6
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sensors/android/jar/bundledjar.pro | 3 | ||||
| -rw-r--r-- | src/plugins/sensors/android/jar/distributedjar.pro | 2 | ||||
| -rw-r--r-- | src/plugins/sensors/android/jar/jar.pri | 13 | ||||
| -rw-r--r-- | src/plugins/sensors/android/jar/jar.pro | 16 |
4 files changed, 14 insertions, 20 deletions
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 |