diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-04 18:53:56 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 18:21:02 +0000 |
| commit | cab060631c9c650fca787b0775263bb2bb6ad764 (patch) | |
| tree | b6072d15e9ac405a1bc1319f80240e8b2eadc01f /src/plugins/bearer/android/jar/jar.pri | |
| parent | 0fcb6c26c1f4a0506bfa7dba181ed6db4e02bdb0 (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: I3fa6819259be365b7a697f7db1d1d01a94032395
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/bearer/android/jar/jar.pri')
| -rw-r--r-- | src/plugins/bearer/android/jar/jar.pri | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/plugins/bearer/android/jar/jar.pri b/src/plugins/bearer/android/jar/jar.pri deleted file mode 100644 index e43dbf0711..0000000000 --- a/src/plugins/bearer/android/jar/jar.pri +++ /dev/null @@ -1,11 +0,0 @@ -load(qt_build_paths) -CONFIG += java -DESTDIR = $$MODULE_BASE_OUTDIR/jar - -JAVACLASSPATH += $$PWD/src - -JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target |