diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java index 874a1c583047..5bab4787de39 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java @@ -173,7 +173,7 @@ public class AndroidPackagingCompiler implements PackagingCompiler { if (libsDir != null) { result.add(libsDir); } - for (AndroidFacet depFacet : AndroidUtils.getAndroidDependencies(facet.getModule(), true)) { + for (AndroidFacet depFacet : AndroidUtils.getAndroidLibraryDependencies(facet.getModule())) { VirtualFile depLibsDir = AndroidRootUtil.getLibsDir(depFacet); if (depLibsDir != null) { result.add(depLibsDir); diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java b/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java index 938709aa0d54..9bf5d2ca049c 100644 --- a/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java +++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java @@ -576,7 +576,7 @@ public class AndroidFacet extends Facet { private VirtualFile[] collectDependencies() { final List dependenciesList = new ArrayList(); - for (AndroidFacet depFacet : AndroidUtils.getAndroidDependencies(getModule(), true)) { + for (AndroidFacet depFacet : AndroidUtils.getAndroidLibraryDependencies(getModule())) { final Module depModule = depFacet.getModule(); final VirtualFile libDir = getBaseAndroidContentRoot(depModule); if (libDir != null) { diff --git a/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java b/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java index 90d506c45efd..cf31d08bcddd 100644 --- a/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java +++ b/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java @@ -638,7 +638,7 @@ public class AndroidUtils { } @NotNull - public static List getAndroidDependencies(@NotNull Module module, boolean androidLibrariesOnly) { + public static List getAndroidLibraryDependencies(@NotNull Module module) { final List depFacets = new ArrayList(); for (OrderEntry orderEntry : ModuleRootManager.getInstance(module).getOrderEntries()) { @@ -651,7 +651,7 @@ public class AndroidUtils { if (depModule != null) { final AndroidFacet depFacet = AndroidFacet.getInstance(depModule); - if (depFacet != null && (!androidLibrariesOnly || depFacet.getConfiguration().LIBRARY_PROJECT)) { + if (depFacet != null && depFacet.getConfiguration().LIBRARY_PROJECT) { depFacets.add(depFacet); } }