Merge "intellij-gen: Fix test source dir tag."

2015-08-26 22:06:49 +00:00
parent bf585da94d 6984d17aa7
commit d9a364e405
1 changed files with 2 additions and 1 deletions
--- a/tools/idegen/src/com/android/idegen/Module.java
+++ b/tools/idegen/src/com/android/idegen/Module.java
@@ -234,7 +234,8 @@ public class Module {
        for (File src : srcDirs) {
            String relative = src.getCanonicalPath().substring(moduleDir.length());
            boolean isTestSource = false;
-            if (relative.startsWith("/test")) {
+            // This covers directories like .../test[s]/...
+            if (relative.matches(".*/tests?/.*")) {
                isTestSource = true;
            }
            sourceDirectories.append("      <sourceFolder url=\"file://$MODULE_DIR$")