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-92171 pass res cache dirs for lib modules to aapt

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-10-01 20:27:04 +04:00
parent 51dad83de9
commit f318b5f344
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
+11 -8
View File
@@ -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