From cab060631c9c650fca787b0775263bb2bb6ad764 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 4 Sep 2017 18:53:56 -0700 Subject: 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 --- src/android/jar/bundledjar.pro | 3 --- src/android/jar/distributedjar.pro | 2 -- src/android/jar/jar.pri | 26 -------------------- src/android/jar/jar.pro | 30 +++++++++++++++++++++-- src/corelib/corelib.pro | 4 +-- src/network/network.pro | 2 -- src/plugins/bearer/android/jar/bundledjar.pro | 3 --- src/plugins/bearer/android/jar/distributedjar.pro | 2 -- src/plugins/bearer/android/jar/jar.pri | 11 --------- src/plugins/bearer/android/jar/jar.pro | 15 ++++++++++-- 10 files changed, 42 insertions(+), 56 deletions(-) delete mode 100644 src/android/jar/bundledjar.pro delete mode 100644 src/android/jar/distributedjar.pro delete mode 100644 src/android/jar/jar.pri delete mode 100644 src/plugins/bearer/android/jar/bundledjar.pro delete mode 100644 src/plugins/bearer/android/jar/distributedjar.pro delete mode 100644 src/plugins/bearer/android/jar/jar.pri (limited to 'src') diff --git a/src/android/jar/bundledjar.pro b/src/android/jar/bundledjar.pro deleted file mode 100644 index e82c01c51b..0000000000 --- a/src/android/jar/bundledjar.pro +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = QtAndroid-bundled -CONFIG += bundled_jar_file -include(jar.pri) diff --git a/src/android/jar/distributedjar.pro b/src/android/jar/distributedjar.pro deleted file mode 100644 index 15f362f629..0000000000 --- a/src/android/jar/distributedjar.pro +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = QtAndroid -include(jar.pri) diff --git a/src/android/jar/jar.pri b/src/android/jar/jar.pri deleted file mode 100644 index 4535880536..0000000000 --- a/src/android/jar/jar.pri +++ /dev/null @@ -1,26 +0,0 @@ -CONFIG += java -DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar -API_VERSION = android-16 - -PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/ - -JAVACLASSPATH += $$PWD/src/ -JAVASOURCES += \ - $$PATHPREFIX/accessibility/QtAccessibilityDelegate.java \ - $$PATHPREFIX/accessibility/QtNativeAccessibility.java \ - $$PATHPREFIX/QtActivityDelegate.java \ - $$PATHPREFIX/QtEditText.java \ - $$PATHPREFIX/QtInputConnection.java \ - $$PATHPREFIX/QtLayout.java \ - $$PATHPREFIX/QtMessageDialogHelper.java \ - $$PATHPREFIX/QtNative.java \ - $$PATHPREFIX/QtNativeLibrariesDir.java \ - $$PATHPREFIX/QtSurface.java \ - $$PATHPREFIX/ExtractStyle.java \ - $$PATHPREFIX/EditMenu.java \ - $$PATHPREFIX/EditPopupMenu.java \ - $$PATHPREFIX/CursorHandle.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro index 8d19c1b7d6..603e28aeee 100644 --- a/src/android/jar/jar.pro +++ b/src/android/jar/jar.pro @@ -1,2 +1,28 @@ -TEMPLATE = subdirs -SUBDIRS += bundledjar.pro distributedjar.pro +TARGET = QtAndroid + +CONFIG += java +DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar +API_VERSION = android-16 + +PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/ + +JAVACLASSPATH += $$PWD/src/ +JAVASOURCES += \ + $$PATHPREFIX/accessibility/QtAccessibilityDelegate.java \ + $$PATHPREFIX/accessibility/QtNativeAccessibility.java \ + $$PATHPREFIX/QtActivityDelegate.java \ + $$PATHPREFIX/QtEditText.java \ + $$PATHPREFIX/QtInputConnection.java \ + $$PATHPREFIX/QtLayout.java \ + $$PATHPREFIX/QtMessageDialogHelper.java \ + $$PATHPREFIX/QtNative.java \ + $$PATHPREFIX/QtNativeLibrariesDir.java \ + $$PATHPREFIX/QtSurface.java \ + $$PATHPREFIX/ExtractStyle.java \ + $$PATHPREFIX/EditMenu.java \ + $$PATHPREFIX/EditPopupMenu.java \ + $$PATHPREFIX/CursorHandle.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 7f018bdb94..3ab7794f2e 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -16,12 +16,10 @@ CONFIG += optimize_full QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf -ANDROID_JAR_DEPENDENCIES = \ - jar/QtAndroid.jar ANDROID_LIB_DEPENDENCIES = \ plugins/platforms/android/libqtforandroid.so ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroid-bundled.jar + jar/QtAndroid.jar ANDROID_PERMISSIONS = \ android.permission.INTERNET \ android.permission.WRITE_EXTERNAL_STORAGE diff --git a/src/network/network.pro b/src/network/network.pro index 98fbf82275..b8272d91d6 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -24,8 +24,6 @@ QMAKE_LIBS += $$QMAKE_LIBS_NETWORK qtConfig(bearermanagement) { ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidBearer-bundled.jar - ANDROID_JAR_DEPENDENCIES = \ jar/QtAndroidBearer.jar ANDROID_LIB_DEPENDENCIES = \ plugins/bearer/libqandroidbearer.so diff --git a/src/plugins/bearer/android/jar/bundledjar.pro b/src/plugins/bearer/android/jar/bundledjar.pro deleted file mode 100644 index 6037f813f2..0000000000 --- a/src/plugins/bearer/android/jar/bundledjar.pro +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = QtAndroidBearer-bundled -CONFIG += bundled_jar_file -include(jar.pri) diff --git a/src/plugins/bearer/android/jar/distributedjar.pro b/src/plugins/bearer/android/jar/distributedjar.pro deleted file mode 100644 index c769a113d5..0000000000 --- a/src/plugins/bearer/android/jar/distributedjar.pro +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = QtAndroidBearer -include(jar.pri) 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 diff --git a/src/plugins/bearer/android/jar/jar.pro b/src/plugins/bearer/android/jar/jar.pro index 923e757d9b..f988019dac 100644 --- a/src/plugins/bearer/android/jar/jar.pro +++ b/src/plugins/bearer/android/jar/jar.pro @@ -1,2 +1,13 @@ -TEMPLATE=subdirs -SUBDIRS += distributedjar.pro bundledjar.pro +TARGET = QtAndroidBearer + +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 -- cgit v1.2.3