From 4d5368ab4fddee4439c808be2b4d56f5fd2dd271 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 6 Sep 2017 14:11:03 +0300 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: Id370f03de61463bb3a8312d357374cf5c89fca69 Reviewed-by: Jake Petroules --- src/androidextras/androidextras.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/androidextras/androidextras.pro') diff --git a/src/androidextras/androidextras.pro b/src/androidextras/androidextras.pro index 584c82e..132643d 100644 --- a/src/androidextras/androidextras.pro +++ b/src/androidextras/androidextras.pro @@ -9,8 +9,6 @@ include(jni/jni.pri) include(android/android.pri) ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidExtras-bundled.jar -ANDROID_JAR_DEPENDENCIES = \ jar/QtAndroidExtras.jar load(qt_module) -- cgit v1.2.3