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

fix: pass correct output dir for artifacts

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-04-24 20:34:33 +04:00
parent 62291adba8
commit a9918de0c1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/compiler/AndroidLibraryPackagingCompiler.java
+4 -5
View File
@@ -46,12 +46,12 @@ public class AndroidLibraryPackagingCompiler implements ClassPostProcessingCompi
final CompilerModuleExtension extension = CompilerModuleExtension.getInstance(module);
LOG.assertTrue(extension != null);
final VirtualFile outputDir = extension.getCompilerOutputPath();
if (outputDir == null) {
final VirtualFile classesDir = extension.getCompilerOutputPath();
if (classesDir == null) {
continue;
}
final HashSet<VirtualFile> firstPackageDirs = new HashSet<VirtualFile>();
AndroidDexCompiler.addModuleOutputDir(firstPackageDirs, outputDir);
AndroidDexCompiler.addModuleOutputDir(firstPackageDirs, classesDir);
if (firstPackageDirs.size() == 0) {
continue;
@@ -62,8 +62,7 @@ public class AndroidLibraryPackagingCompiler implements ClassPostProcessingCompi
LOG.error("Cannot find output directory for dex");
continue;
}
result.add(new MyProcessingItem(module, firstPackageDirs.toArray(new VirtualFile[firstPackageDirs.size()]), outputDir));
result.add(new MyProcessingItem(module, firstPackageDirs.toArray(new VirtualFile[firstPackageDirs.size()]), outputDirectory));
}
return result.toArray(new ProcessingItem[result.size()]);
}