From f318b5f3447ba67dc6e9ea6cbef8870b93d50ae3 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Mon, 1 Oct 2012 20:22:48 +0400
Subject: [PATCH] IDEA-92171 pass res cache dirs for lib modules to aapt

---
 .../jetbrains/jps/android/AndroidJpsUtil.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
index 8369e61f2246..3a7e6c7f563c 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
@@ -441,7 +441,18 @@ public class AndroidJpsUtil {
                                                            boolean withCacheDirs,
                                                            @NotNull CompileContext context) throws IOException {
     final List<String> result = new ArrayList<String>();
+    addCompilableResourceDirsForModule(extension, withCacheDirs, context, result);
 
+    for (JpsAndroidModuleExtension depExtension : getAllAndroidDependencies(extension.getModule(), true)) {
+      addCompilableResourceDirsForModule(depExtension, withCacheDirs, context, result);
+    }
+    return ArrayUtil.toStringArray(result);
+  }
+
+  private static void addCompilableResourceDirsForModule(JpsAndroidModuleExtension extension,
+                                                         boolean withCacheDirs,
+                                                         CompileContext context,
+                                                         List<String> result) throws IOException {
     if (withCacheDirs) {
       final File resourcesCacheDir = getResourcesCacheDir(context, extension.getModule());
       if (resourcesCacheDir.exists()) {
@@ -458,14 +469,6 @@ public class AndroidJpsUtil {
     if (generatedResourcesStorage.exists()) {
       result.add(generatedResourcesStorage.getPath());
     }
-
-    for (JpsAndroidModuleExtension depExtension : getAllAndroidDependencies(extension.getModule(), true)) {
-      final File depResDir = getResourceDirForCompilationPath(depExtension);
-      if (depResDir != null) {
-        result.add(depResDir.getPath());
-      }
-    }
-    return ArrayUtil.toStringArray(result);
   }
 
   @Nullable