11 files changed, 45 insertions, 80 deletions
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf
index 852954e5ca..f1f5e4c10c 100644
--- a/mkspecs/features/java.prf
+++ b/mkspecs/features/java.prf
@@ -7,10 +7,8 @@ android {
     CONFIG += android_app
 }
 
-isEmpty(CLASS_DIR) {
-    bundled_jar_file: CLASS_DIR = .classes.bundled
-    else: CLASS_DIR = .classes
-}
+isEmpty(CLASS_DIR): \
+    CLASS_DIR = .classes
 
 CONFIG -= qt
 
@@ -39,26 +37,7 @@ QMAKE_LIBS =
 QMAKE_LIBS_OPENGL_ES2 =
 QMAKE_LIBDIR =
 QMAKE_EXTENSION_SHLIB = jar
-
-# Override linker with dex (for distributable Android archives) or jar (for other java builds)
-android:!bundled_jar_file {
-    contains(QMAKE_HOST.os, Windows) {
-        # The location where dx.bat expects itself to be found is used as the landmark instead
-        # of the base sdk folder.
-        # Doing it this way makes this logic more similar to the other platforms and
-        # also means that our dx.bat is more like Google's dx.bat
-        DEX_BAT = $$ANDROID_SDK_ROOT/platform-tools/dx.bat
-        !exists($$DEX_BAT): DEX_BAT = $$ANDROID_SDK_ROOT/build-tools/$$ANDROID_SDK_BUILD_TOOLS_REVISION/dx.bat
-        DEX_CMD = $$PWD/data/android/dx $$DEX_BAT
-    } else {
-        DEX_CMD = $$ANDROID_SDK_ROOT/platform-tools/dx
-        !exists($$DEX_CMD): DEX_CMD = $$ANDROID_SDK_ROOT/build-tools/$$ANDROID_SDK_BUILD_TOOLS_REVISION/dx
-        !exists($$DEX_CMD): error("The path $$DEX_CMD does not exist. Please set the environment variable ANDROID_BUILD_TOOLS_REVISION to the revision of the build tools installed in your Android SDK.")
-    }
-    QMAKE_LINK_SHLIB_CMD = $$DEX_CMD --dex --output $(TARGET) $$CLASS_DIR
-} else {
-    QMAKE_LINK_SHLIB_CMD = jar cf $(TARGET) -C $$CLASS_DIR .
-}
+QMAKE_LINK_SHLIB_CMD = jar cf $(TARGET) -C $$CLASS_DIR .
 
 # Force link step to always happen, since we are always updating the
 # .class files
diff --git a/src/android/jar/bundledjar.pro b/src/android/jar/bundledjar.pro
deleted file mode 100644
index e82c01c51b..0000000000
--- a/src/android/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = QtAndroid-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)
diff --git a/src/android/jar/distributedjar.pro b/src/android/jar/distributedjar.pro
deleted file mode 100644
index 15f362f629..0000000000
--- a/src/android/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtAndroid
-include(jar.pri)
diff --git a/src/android/jar/jar.pri b/src/android/jar/jar.pri
deleted file mode 100644
index 4535880536..0000000000
--- a/src/android/jar/jar.pri
+++ /dev/null
@@ -1,26 +0,0 @@
-CONFIG += java
-DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar
-API_VERSION = android-16
-
-PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/
-
-JAVACLASSPATH += $$PWD/src/
-JAVASOURCES += \
-    $$PATHPREFIX/accessibility/QtAccessibilityDelegate.java \
-    $$PATHPREFIX/accessibility/QtNativeAccessibility.java \
-    $$PATHPREFIX/QtActivityDelegate.java \
-    $$PATHPREFIX/QtEditText.java \
-    $$PATHPREFIX/QtInputConnection.java \
-    $$PATHPREFIX/QtLayout.java \
-    $$PATHPREFIX/QtMessageDialogHelper.java \
-    $$PATHPREFIX/QtNative.java \
-    $$PATHPREFIX/QtNativeLibrariesDir.java \
-    $$PATHPREFIX/QtSurface.java \
-    $$PATHPREFIX/ExtractStyle.java \
-    $$PATHPREFIX/EditMenu.java \
-    $$PATHPREFIX/EditPopupMenu.java \
-    $$PATHPREFIX/CursorHandle.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro
index 8d19c1b7d6..603e28aeee 100644
--- a/src/android/jar/jar.pro
+++ b/src/android/jar/jar.pro
@@ -1,2 +1,28 @@
-TEMPLATE = subdirs
-SUBDIRS += bundledjar.pro distributedjar.pro
+TARGET = QtAndroid
+
+CONFIG += java
+DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar
+API_VERSION = android-16
+
+PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/
+
+JAVACLASSPATH += $$PWD/src/
+JAVASOURCES += \
+    $$PATHPREFIX/accessibility/QtAccessibilityDelegate.java \
+    $$PATHPREFIX/accessibility/QtNativeAccessibility.java \
+    $$PATHPREFIX/QtActivityDelegate.java \
+    $$PATHPREFIX/QtEditText.java \
+    $$PATHPREFIX/QtInputConnection.java \
+    $$PATHPREFIX/QtLayout.java \
+    $$PATHPREFIX/QtMessageDialogHelper.java \
+    $$PATHPREFIX/QtNative.java \
+    $$PATHPREFIX/QtNativeLibrariesDir.java \
+    $$PATHPREFIX/QtSurface.java \
+    $$PATHPREFIX/ExtractStyle.java \
+    $$PATHPREFIX/EditMenu.java \
+    $$PATHPREFIX/EditPopupMenu.java \
+    $$PATHPREFIX/CursorHandle.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 7f018bdb94..3ab7794f2e 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -16,12 +16,10 @@ CONFIG += optimize_full
 
 QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf
 
-ANDROID_JAR_DEPENDENCIES = \
-    jar/QtAndroid.jar
 ANDROID_LIB_DEPENDENCIES = \
     plugins/platforms/android/libqtforandroid.so
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtAndroid-bundled.jar
+    jar/QtAndroid.jar
 ANDROID_PERMISSIONS = \
     android.permission.INTERNET \
     android.permission.WRITE_EXTERNAL_STORAGE
diff --git a/src/network/network.pro b/src/network/network.pro
index 98fbf82275..b8272d91d6 100644
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -24,8 +24,6 @@ QMAKE_LIBS += $$QMAKE_LIBS_NETWORK
 
 qtConfig(bearermanagement) {
     ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-        jar/QtAndroidBearer-bundled.jar
-    ANDROID_JAR_DEPENDENCIES = \
         jar/QtAndroidBearer.jar
     ANDROID_LIB_DEPENDENCIES = \
         plugins/bearer/libqandroidbearer.so
diff --git a/src/plugins/bearer/android/jar/bundledjar.pro b/src/plugins/bearer/android/jar/bundledjar.pro
deleted file mode 100644
index 6037f813f2..0000000000
--- a/src/plugins/bearer/android/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = QtAndroidBearer-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)
diff --git a/src/plugins/bearer/android/jar/distributedjar.pro b/src/plugins/bearer/android/jar/distributedjar.pro
deleted file mode 100644
index c769a113d5..0000000000
--- a/src/plugins/bearer/android/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtAndroidBearer
-include(jar.pri)
diff --git a/src/plugins/bearer/android/jar/jar.pri b/src/plugins/bearer/android/jar/jar.pri
deleted file mode 100644
index e43dbf0711..0000000000
--- a/src/plugins/bearer/android/jar/jar.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-load(qt_build_paths)
-CONFIG += java
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
diff --git a/src/plugins/bearer/android/jar/jar.pro b/src/plugins/bearer/android/jar/jar.pro
index 923e757d9b..f988019dac 100644
--- a/src/plugins/bearer/android/jar/jar.pro
+++ b/src/plugins/bearer/android/jar/jar.pro
@@ -1,2 +1,13 @@
-TEMPLATE=subdirs
-SUBDIRS += distributedjar.pro bundledjar.pro
+TARGET = QtAndroidBearer
+
+load(qt_build_paths)
+CONFIG += java
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target