aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/android/androidmanager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 29ff4ed09b..03aa1b56b6 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -895,8 +895,14 @@ QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel,
if (libElement.attribute(QLatin1String("bundling")).toInt() == (item == BundledJar ? 1 : 0)) {
if (libElement.hasAttribute(attribute)) {
QString dependencyLib = libElement.attribute(attribute).arg(apiLevel);
- if (!dependencyLibs.contains(dependencyLib))
+ if (libElement.hasAttribute(QLatin1String("extends"))) {
+ const QString extends = libElement.attribute(QLatin1String("extends"));
+ if (libs.contains(extends)) {
+ dependencyLibs << dependencyLib;
+ }
+ } else if (!dependencyLibs.contains(dependencyLib)) {
dependencyLibs << dependencyLib;
+ }
}
if (libElement.hasAttribute(QLatin1String("replaces"))) {