From 2c8c562e02731e840d922381561ca82106101351 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 17 Apr 2012 18:57:14 +0400 Subject: [PATCH] show warnings for app modules only --- .../src/org/jetbrains/android/compiler/AndroidAptCompiler.java | 2 +- .../org/jetbrains/android/compiler/AndroidAutogenerator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java index 2e0d4d54db6c..6349f4880e33 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java @@ -263,7 +263,7 @@ public class AndroidAptCompiler implements SourceGeneratingCompiler { final String[] libPackages = getLibPackages(module, packageName); final Module circularDepLibWithSamePackage = AndroidCompileUtil.findCircularDependencyOnLibraryWithSamePackage(facet); - if (circularDepLibWithSamePackage != null) { + if (circularDepLibWithSamePackage != null && !facet.getConfiguration().LIBRARY_PROJECT) { myContext.addMessage(CompilerMessageCategory.WARNING, AndroidBundle.message("android.compilation.warning.circular.app.dependency", packageName, module.getName(), diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidAutogenerator.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidAutogenerator.java index 623ade3e0a71..c5d4f05b6c48 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidAutogenerator.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidAutogenerator.java @@ -163,7 +163,7 @@ public class AndroidAutogenerator { final String manifestFileOsPath = FileUtil.toSystemDependentName(manifestFile.getPath()); final Module circularDepLibWithSamePackage = AndroidCompileUtil.findCircularDependencyOnLibraryWithSamePackage(facet); - if (circularDepLibWithSamePackage != null) { + if (circularDepLibWithSamePackage != null && !facet.getConfiguration().LIBRARY_PROJECT) { context.addMessage(CompilerMessageCategory.WARNING, AndroidBundle.message("android.compilation.warning.circular.app.dependency", packageName, module.getName(), circularDepLibWithSamePackage.getName()), null, -1, -1);