diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-04 22:09:04 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 18:21:51 +0000 |
| commit | dbb8f97bf3e3a50c6841ab79bbf4b5d6294b8d65 (patch) | |
| tree | cc226e2474448fe4a7b4823ba32433654d373e51 /src/android/bluetooth | |
| parent | 1c27afaed55a01570cae04b5dc46ddb9884c6566 (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: Ifc13542ff71844da7e80cefe9ff51e3d7cdfc830
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/android/bluetooth')
| -rw-r--r-- | src/android/bluetooth/bluetooth.pri | 17 | ||||
| -rw-r--r-- | src/android/bluetooth/bluetooth.pro | 21 | ||||
| -rw-r--r-- | src/android/bluetooth/bundledjar.pro | 3 | ||||
| -rw-r--r-- | src/android/bluetooth/distributedjar.pro | 2 |
4 files changed, 19 insertions, 24 deletions
diff --git a/src/android/bluetooth/bluetooth.pri b/src/android/bluetooth/bluetooth.pri deleted file mode 100644 index fa811ac1..00000000 --- a/src/android/bluetooth/bluetooth.pri +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG += java -DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar -API_VERSION = android-21 - -PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/bluetooth - -JAVACLASSPATH += $$PWD/src/ -JAVASOURCES += \ - $$PATHPREFIX/QtBluetoothBroadcastReceiver.java \ - $$PATHPREFIX/QtBluetoothSocketServer.java \ - $$PATHPREFIX/QtBluetoothInputStreamThread.java \ - $$PATHPREFIX/QtBluetoothLE.java \ - $$PATHPREFIX/QtBluetoothLEServer.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target diff --git a/src/android/bluetooth/bluetooth.pro b/src/android/bluetooth/bluetooth.pro index 8d19c1b7..b76b392c 100644 --- a/src/android/bluetooth/bluetooth.pro +++ b/src/android/bluetooth/bluetooth.pro @@ -1,2 +1,19 @@ -TEMPLATE = subdirs -SUBDIRS += bundledjar.pro distributedjar.pro +TARGET = QtAndroidBluetooth + +CONFIG += java +DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar +API_VERSION = android-21 + +PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/bluetooth + +JAVACLASSPATH += $$PWD/src/ +JAVASOURCES += \ + $$PATHPREFIX/QtBluetoothBroadcastReceiver.java \ + $$PATHPREFIX/QtBluetoothSocketServer.java \ + $$PATHPREFIX/QtBluetoothInputStreamThread.java \ + $$PATHPREFIX/QtBluetoothLE.java \ + $$PATHPREFIX/QtBluetoothLEServer.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target diff --git a/src/android/bluetooth/bundledjar.pro b/src/android/bluetooth/bundledjar.pro deleted file mode 100644 index 8912674a..00000000 --- a/src/android/bluetooth/bundledjar.pro +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = QtAndroidBluetooth-bundled -CONFIG += bundled_jar_file -include(bluetooth.pri) diff --git a/src/android/bluetooth/distributedjar.pro b/src/android/bluetooth/distributedjar.pro deleted file mode 100644 index a155bdf2..00000000 --- a/src/android/bluetooth/distributedjar.pro +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = QtAndroidBluetooth -include(bluetooth.pri) |