diff options
| -rw-r--r-- | mkspecs/features/android.prf | 13 | ||||
| -rw-r--r-- | src/android/java/java.pro | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mkspecs/features/android.prf b/mkspecs/features/android.prf index 2a3086d4ad..5e21f0b845 100644 --- a/mkspecs/features/android.prf +++ b/mkspecs/features/android.prf @@ -2,13 +2,10 @@ contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so QMAKE_LFLAGS += -Wl,-soname,$$TARGET + + android_install: { + target.path=/libs/$$ANDROID_TARGET_ARCH/ + INSTALLS *= target + } } } -!QTDIR_build:android_install { - isEmpty(QT_BUILD_TREE) { - target.path=/libs/$$ANDROID_TARGET_ARCH/ - } else { - target.path = / - } - INSTALLS *= target -} diff --git a/src/android/java/java.pro b/src/android/java/java.pro index 22c8ecc034..9d682e4f23 100644 --- a/src/android/java/java.pro +++ b/src/android/java/java.pro @@ -1,4 +1,4 @@ -CONFIG -= qt +CONFIG -= qt android_install javaresources.files = \ $$PWD/AndroidManifest.xml \ |