From a9918de0c1d23ce3f7e3dbe679ae838e582435d8 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 24 Apr 2012 16:11:39 +0400 Subject: [PATCH] fix: pass correct output dir for artifacts --- .../compiler/AndroidLibraryPackagingCompiler.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidLibraryPackagingCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidLibraryPackagingCompiler.java index b442f022b8a8..065bddeda658 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidLibraryPackagingCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidLibraryPackagingCompiler.java @@ -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 firstPackageDirs = new HashSet(); - 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()]); }