diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2017-09-06 14:11:03 +0300 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 20:32:50 +0000 |
| commit | 4d5368ab4fddee4439c808be2b4d56f5fd2dd271 (patch) | |
| tree | 4d6ac11b0c9f6e457da1b4ba0178416eedc3dbce /src/androidextras/androidextras.pro | |
| parent | 0b48845e85e3bc6da8dd88b77dbe258877c64eed (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: Id370f03de61463bb3a8312d357374cf5c89fca69
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/androidextras/androidextras.pro')
| -rw-r--r-- | src/androidextras/androidextras.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/androidextras/androidextras.pro b/src/androidextras/androidextras.pro index 584c82e..132643d 100644 --- a/src/androidextras/androidextras.pro +++ b/src/androidextras/androidextras.pro @@ -9,8 +9,6 @@ include(jni/jni.pri) include(android/android.pri) ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidExtras-bundled.jar -ANDROID_JAR_DEPENDENCIES = \ jar/QtAndroidExtras.jar load(qt_module) |