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-84320 do not pack Manifest class from library project into apk

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-04-10 21:21:51 +04:00
parent 5d8433e70f
commit 5269a132b4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java
+7 -3
View File
@@ -52,7 +52,9 @@ public class AndroidCommonUtils {
private static final Pattern WARNING_PATTERN = Pattern.compile(".*warning.*");
private static final Pattern ERROR_PATTERN = Pattern.compile(".*error.*");
private static final Pattern EXCEPTION_PATTERN = Pattern.compile(".*exception.*");
private static Pattern R_PATTERN = Pattern.compile("R(\\$.*)?\\.class");
private static Pattern MANIFEST_PATTERN = Pattern.compile("Manifest(\\$.*)?\\.class");
public static final Pattern COMPILER_MESSAGE_PATTERN = Pattern.compile("(.+):(\\d+):.+");
@@ -204,7 +206,7 @@ public class AndroidCommonUtils {
private static void addFileToJar(@NotNull File file,
@NotNull File rootDirectory,
boolean packRClasses,
boolean packRAndManifestClasses,
@NotNull List<Pair<File, String>> files)
throws IOException {
@@ -213,7 +215,7 @@ public class AndroidCommonUtils {
if (children != null) {
for (File child : children) {
addFileToJar(child, rootDirectory, packRClasses, files);
addFileToJar(child, rootDirectory, packRAndManifestClasses, files);
}
}
}
@@ -222,7 +224,9 @@ public class AndroidCommonUtils {
return;
}
if (!packRClasses && R_PATTERN.matcher(file.getName()).matches()) {
if (!packRAndManifestClasses &&
(R_PATTERN.matcher(file.getName()).matches() ||
MANIFEST_PATTERN.matcher(file.getName()).matches())) {
return;
}