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

add only direct jar dependencies into apk in mavenized mode

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-08-27 21:40:20 +04:00
parent 8c53d8790e
commit f2fd5b3331
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
+10 -3
View File
@@ -217,14 +217,19 @@ class AndroidJpsUtil {
public static void processClasspath(@NotNull CompileContext context,
@NotNull JpsModule module,
@NotNull AndroidDependencyProcessor processor) {
processClasspath(context, module, processor, new HashSet<String>(), false);
// In a module imported from Maven dependencies are transitive, so we don't need to traverse all dependency tree
// and compute all jars referred by library modules. Moreover it would be incorrect,
// because Maven has dependency resolving algorithm based on versioning
final boolean recursive = isMavenizedModule(module);
processClasspath(context, module, processor, new HashSet<String>(), false, recursive);
}
private static void processClasspath(@NotNull CompileContext context,
@NotNull final JpsModule module,
@NotNull final AndroidDependencyProcessor processor,
@NotNull final Set<String> visitedModules,
final boolean exportedLibrariesOnly) {
final boolean exportedLibrariesOnly,
final boolean recursive) {
if (!visitedModules.add(module.getName())) {
return;
}
@@ -283,7 +288,9 @@ class AndroidJpsUtil {
// do not support android-app->android-app compile dependencies
processor.processJavaModuleOutputDirectory(depClassDir);
}
processClasspath(context, depModule, processor, visitedModules, !depLibrary || exportedLibrariesOnly);
if (recursive) {
processClasspath(context, depModule, processor, visitedModules, !depLibrary || exportedLibrariesOnly, recursive);
}
}
}
}
plugins/android/src/org/jetbrains/android/facet/AndroidRootUtil.java
+13 -4
View File
@@ -34,6 +34,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.util.containers.OrderedSet;
import org.jetbrains.android.compiler.AndroidCompileUtil;
import org.jetbrains.android.maven.AndroidMavenUtil;
import org.jetbrains.android.sdk.AndroidPlatform;
import org.jetbrains.android.sdk.AndroidSdkAdditionalData;
import org.jetbrains.android.sdk.AndroidSdkType;
@@ -226,7 +227,8 @@ public class AndroidRootUtil {
final Set<VirtualFile> outputDirs,
@Nullable final Set<VirtualFile> libraries,
final Set<Module> visited,
final boolean exportedLibrariesOnly) {
final boolean exportedLibrariesOnly,
final boolean recursive) {
if (!visited.add(module)) {
return;
}
@@ -288,7 +290,10 @@ public class AndroidRootUtil {
outputDirs.add(classDir);
}
}
fillExternalLibrariesAndModules(depModule, outputDirs, libraries, visited, !libraryProject || exportedLibrariesOnly);
if (recursive) {
fillExternalLibrariesAndModules(depModule, outputDirs, libraries, visited,
!libraryProject || exportedLibrariesOnly, recursive);
}
}
}
}
@@ -299,7 +304,11 @@ public class AndroidRootUtil {
public static List<VirtualFile> getExternalLibraries(Module module) {
Set<VirtualFile> files = new HashSet<VirtualFile>();
OrderedSet<VirtualFile> libs = new OrderedSet<VirtualFile>();
fillExternalLibrariesAndModules(module, files, libs, new HashSet<Module>(), false);
// In a module imported from Maven dependencies are transitive, so we don't need to traverse all dependency tree
// and compute all jars referred by library modules. Moreover it would be incorrect,
// because Maven has dependency resolving algorithm based on versioning
final boolean recursive = !AndroidMavenUtil.isMavenizedModule(module);
fillExternalLibrariesAndModules(module, files, libs, new HashSet<Module>(), false, recursive);
addAnnotationsJar(module, libs);
return libs;
@@ -336,7 +345,7 @@ public class AndroidRootUtil {
public static Set<VirtualFile> getDependentModules(Module module,
VirtualFile moduleOutputDir) {
Set<VirtualFile> files = new HashSet<VirtualFile>();
fillExternalLibrariesAndModules(module, files, null, new HashSet<Module>(), false);
fillExternalLibrariesAndModules(module, files, null, new HashSet<Module>(), false, true);
files.remove(moduleOutputDir);
return files;
}