From 72d4f0750baae1bb296341bde166f020d29c7faa Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Tue, 6 Jun 2017 20:37:29 +0200
Subject: [PATCH] don't auto-create install targets for static libs

these are not meant to be deployed, so the install hack should skip
them.

Task-number: QTBUG-42830
Change-Id: I870499dca2cfea87bf0048f019d651ce9cc5d788
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/android/android.prf        | 2 +-
 mkspecs/features/android/resolve_target.prf | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf
index d2a3ee54c10..45eadc9fdb2 100644
--- a/mkspecs/features/android/android.prf
+++ b/mkspecs/features/android/android.prf
@@ -11,7 +11,7 @@ contains(TEMPLATE, ".*app") {
             INSTALLS *= target
         }
     }
-} else: contains(TEMPLATE, "lib"):android_install {
+} else: contains(TEMPLATE, "lib"):!static:android_install {
     target.path = /libs/$$ANDROID_TARGET_ARCH/
     INSTALLS *= target
 }
diff --git a/mkspecs/features/android/resolve_target.prf b/mkspecs/features/android/resolve_target.prf
index 2bbeffcfd05..25682cd8948 100644
--- a/mkspecs/features/android/resolve_target.prf
+++ b/mkspecs/features/android/resolve_target.prf
@@ -1,2 +1,3 @@
+load(resolve_config)
 load(android)
 load(resolve_target)