diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-04 22:25:53 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 18:22:20 +0000 |
| commit | 210ff1abde8591caadf6d9054cacd9c9e6e7105e (patch) | |
| tree | b5570f7fe9bc53a869111d3ef1a116cf0f28f14c /src/multimedia | |
| parent | fec653b6f4402e70ee6d11f8beba070ece0b3d8d (diff) | |
| download | qtmultimedia-210ff1abde8591caadf6d9054cacd9c9e6e7105e.tar.gz | |
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: Ib53cbfe1009aa7e37de109dc317a58968854bf59
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/multimedia.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 0f3f3ff6b..36ec1f789 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -67,8 +67,6 @@ include(recording/recording.pri) include(video/video.pri) ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils -ANDROID_JAR_DEPENDENCIES = \ jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils ANDROID_LIB_DEPENDENCIES = \ plugins/mediaservice/libqtmedia_android.so \ |