diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-04 22:39:08 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 18:24:04 +0000 |
| commit | 41bdec2f3d682c6b3a2e93942e576f91beb7606f (patch) | |
| tree | b0410279c27c3d2e1925d19e8d319718fec97b3f | |
| parent | e507f3738d541351081b35c4a823c24b063041c2 (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: I36111210bc0e4684044b173d1d0ef66d342ed13f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | src/jar/bundledjar.pro | 3 | ||||
| -rw-r--r-- | src/jar/distributedjar.pro | 2 | ||||
| -rw-r--r-- | src/jar/jar.pri | 11 | ||||
| -rw-r--r-- | src/jar/jar.pro | 14 | ||||
| -rw-r--r-- | src/webview/webview-lib.pri | 2 |
5 files changed, 12 insertions, 20 deletions
diff --git a/src/jar/bundledjar.pro b/src/jar/bundledjar.pro deleted file mode 100644 index abe173b..0000000 --- a/src/jar/bundledjar.pro +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = QtAndroidWebView-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 710983e..0000000 --- a/src/jar/distributedjar.pro +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = QtAndroidWebView -include(jar.pri) diff --git a/src/jar/jar.pri b/src/jar/jar.pri deleted file mode 100644 index 0c4f499..0000000 --- a/src/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/view/QtAndroidWebViewController.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target diff --git a/src/jar/jar.pro b/src/jar/jar.pro index 6a4fcd3..c432dc0 100644 --- a/src/jar/jar.pro +++ b/src/jar/jar.pro @@ -1,3 +1,13 @@ -TEMPLATE=subdirs -SUBDIRS += distributedjar.pro bundledjar.pro +TARGET = QtAndroidWebView +load(qt_build_paths) +CONFIG += java +DESTDIR = $$MODULE_BASE_OUTDIR/jar + +JAVACLASSPATH += $$PWD/src + +JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target diff --git a/src/webview/webview-lib.pri b/src/webview/webview-lib.pri index f5d6774..0731f87 100644 --- a/src/webview/webview-lib.pri +++ b/src/webview/webview-lib.pri @@ -1,6 +1,4 @@ ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidWebView-bundled.jar -ANDROID_JAR_DEPENDENCIES = \ jar/QtAndroidWebView.jar ANDROID_PERMISSIONS = \ android.permission.ACCESS_FINE_LOCATION |