diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-05-02 11:30:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-03 14:46:15 +0200 |
| commit | 8e202bcad1eef8709836363379cb257e9ebe8a98 (patch) | |
| tree | 092c70e8989ff14e9bbb72fb5fb2949a3c63e1ff /src/plugins/android | |
| parent | 5fa32ce4d076b89003ba9f12998918a9648e1891 (diff) | |
Make it possible to bundle Android builds
We need to adapt to the way the jar builds are split on Android,
into a jar file which can be bundled and one which can be distributed
and loaded on the classpath.
We also need to add meta-information about which plugins the
module depends on so that they can be bundled as well.
Task-number: QTBUG-30751
Change-Id: I5cca51c3732ce72985df29672a219c3fd4fe7bac
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/jar/bundledjar.pro | 3 | ||||
| -rw-r--r-- | src/plugins/android/jar/distributedjar.pro | 2 | ||||
| -rw-r--r-- | src/plugins/android/jar/jar.pri | 14 | ||||
| -rw-r--r-- | src/plugins/android/jar/jar.pro | 16 |
4 files changed, 21 insertions, 14 deletions
diff --git a/src/plugins/android/jar/bundledjar.pro b/src/plugins/android/jar/bundledjar.pro new file mode 100644 index 000000000..cc76164a7 --- /dev/null +++ b/src/plugins/android/jar/bundledjar.pro @@ -0,0 +1,3 @@ +TARGET = QtMultimedia-bundled +CONFIG += bundled_jar_file +include(jar.pri) diff --git a/src/plugins/android/jar/distributedjar.pro b/src/plugins/android/jar/distributedjar.pro new file mode 100644 index 000000000..34724c197 --- /dev/null +++ b/src/plugins/android/jar/distributedjar.pro @@ -0,0 +1,2 @@ +TARGET = QtMultimedia +include(jar.pri) diff --git a/src/plugins/android/jar/jar.pri b/src/plugins/android/jar/jar.pri new file mode 100644 index 000000000..e6a3c63c2 --- /dev/null +++ b/src/plugins/android/jar/jar.pri @@ -0,0 +1,14 @@ +load(qt_build_paths) +CONFIG += java +DESTDIR = $$MODULE_BASE_OUTDIR/jar +API_VERSION = android-11 + +JAVACLASSPATH += $$PWD/src + +JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \ + $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java \ + $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target diff --git a/src/plugins/android/jar/jar.pro b/src/plugins/android/jar/jar.pro index 2fa203a4f..6a4fcd389 100644 --- a/src/plugins/android/jar/jar.pro +++ b/src/plugins/android/jar/jar.pro @@ -1,15 +1,3 @@ -load(qt_build_paths) -CONFIG += java -TARGET = QtMultimedia -DESTDIR = $$MODULE_BASE_OUTDIR/jar -API_VERSION = android-11 +TEMPLATE=subdirs +SUBDIRS += distributedjar.pro bundledjar.pro -JAVACLASSPATH += $$PWD/src - -JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target |