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