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>

src/multimedia/multimedia.pro

@@ -51,10 +51,14 @@ include(radio/radio.pri)
 include(recording/recording.pri)
 include(video/video.pri)
 
+ANDROID_BUNDLED_JAR_DEPENDENCIES = \
+    jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
 ANDROID_JAR_DEPENDENCIES = \
     jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
 ANDROID_LIB_DEPENDENCIES = \
     plugins/mediaservice/libandroidmediaplayer.so
+MODULE_PLUGIN_TYPES = \
+    mediaservice
 
 mac {
    LIBS += -framework AppKit -framework QuartzCore -framework QTKit

src/plugins/android/jar/bundledjar.pro

@@ -0,0 +1,3 @@
+TARGET = QtMultimedia-bundled
+CONFIG += bundled_jar_file
+include(jar.pri)

src/plugins/android/jar/distributedjar.pro

@@ -0,0 +1,2 @@
+TARGET = QtMultimedia
+include(jar.pri)

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

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