From ed514f1a81259e59cecd8fec7db3aacba713f1e4 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 25 Jan 2011 19:32:19 +0300 Subject: [PATCH] IDEA-64596 aidl located in the application module can import classes from libraries --- .../org/jetbrains/android/compiler/AndroidIdlCompiler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidIdlCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidIdlCompiler.java index 9906f94de09c..3b12675d0ff1 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidIdlCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidIdlCompiler.java @@ -24,7 +24,6 @@ import com.intellij.openapi.compiler.*; import com.intellij.openapi.compiler.ex.CompileContextEx; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Computable; @@ -232,9 +231,9 @@ public class AndroidIdlCompiler implements SourceGeneratingCompiler { if (item instanceof IdlGenerationItem) { final IdlGenerationItem idlItem = (IdlGenerationItem)item; try { - ModuleRootManager rootManager = ModuleRootManager.getInstance(idlItem.myModule); + VirtualFile[] sourceRoots = AndroidPackagingCompiler.getSourceRootsForModuleAndDependencies(idlItem.myModule); final Map> messages = AndroidIdl - .execute(idlItem.myAndroidTarget, idlItem.myFile.getPath(), idlItem.myGeneratedFile.getPath(), rootManager.getSourceRoots()); + .execute(idlItem.myAndroidTarget, idlItem.myFile.getPath(), idlItem.myGeneratedFile.getPath(), sourceRoots); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { if (context.getProject().isDisposed()) return;