MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-79255 remove library order entries on external apklibs, because they don't work [rev=rustam.vishnyakov]

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-01-12 16:08:43 +04:00
parent 91c75b1324
commit 9d850b67c0
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporterBase.java
+18
View File
@@ -35,6 +35,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.PathUtil;
import com.intellij.util.Processor;
import com.intellij.util.containers.HashSet;
import com.intellij.util.io.ZipUtil;
@@ -201,9 +202,26 @@ public abstract class AndroidFacetImporterBase extends FacetImporter<AndroidFace
modifiableRootModel.removeOrderEntry(entry);
}
}
else if (entry instanceof LibraryOrderEntry &&
containsDependencyOnApklibFile((LibraryOrderEntry)entry)) {
modifiableRootModel.removeOrderEntry(entry);
}
}
}
private static boolean containsDependencyOnApklibFile(@NotNull LibraryOrderEntry libraryOrderEntry) {
final String[] urls = libraryOrderEntry.getRootUrls(OrderRootType.CLASSES);
for (String url : urls) {
final String fileName = PathUtil.getFileName(PathUtil.toPresentableUrl(url));
if ("apklib".equals(FileUtil.getExtension(fileName))) {
return true;
}
}
return false;
}
private static void addCompileModuleDependency(@NotNull MavenModifiableModelsProvider modelsProvider,
@NotNull ModifiableRootModel rootModel,
@NotNull final String moduleName) {