From cab060631c9c650fca787b0775263bb2bb6ad764 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 4 Sep 2017 18:53:56 -0700 Subject: 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: I3fa6819259be365b7a697f7db1d1d01a94032395 Reviewed-by: BogDan Vatra --- mkspecs/features/java.prf | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'mkspecs/features/java.prf') 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 -- cgit v1.2.3