summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/android
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2017-06-26 16:25:41 +0200
committerAkseli Salovaara <akseli.salovaara@qt.io>2017-06-27 10:38:40 +0000
commit11d36bd9eb29995629fe460bb1b24383b47ae5e5 (patch)
tree7f9d69b8346cf35dc1b3839eb82a29ce8a759c45 /mkspecs/features/android
parent0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae (diff)
Revert "don't overwrite pre-existing INSTALL for target"
This reverts commit c0e94dd0933c549f35d05318cdcd97572c61fabf, as it introduced a regression for applications that sets an installation target (on Android), which a lot of our examples do. The installation target for Android applications/libraries needs to be within in the application bundle's directory tree, or it won't work. Task-number: QTBUG-61635 Change-Id: I8c919ef3888d7679b0f9659796f5e590bc1faa57 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'mkspecs/features/android')
-rw-r--r--mkspecs/features/android/android.prf5
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf
index 45eadc9fdb..1dc8f87313 100644
--- a/mkspecs/features/android/android.prf
+++ b/mkspecs/features/android/android.prf
@@ -1,6 +1,3 @@
-android_install:contains(INSTALLS, target):!isEmpty(target.path): \
- CONFIG -= android_install
-
contains(TEMPLATE, ".*app") {
!android_app {
!contains(TARGET, ".so"): TARGET = lib$${TARGET}.so
@@ -11,7 +8,7 @@ contains(TEMPLATE, ".*app") {
INSTALLS *= target
}
}
-} else: contains(TEMPLATE, "lib"):!static:android_install {
+} else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install {
target.path = /libs/$$ANDROID_TARGET_ARCH/
INSTALLS *= target
}