LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor the way we handle directories in traverse.

Browse Source 
Bug: 18064146
Change-Id: I45fba9c2978bc0c8f23804c730ab631da759ac70
This commit is contained in:
Paul Crowley
2014-10-21 13:02:46 +01:00
parent 365ab0f4e6
commit 7fdedf010d
1 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tools/idegen/src/Configuration.java
View File

@@ -123,16 +123,27 @@ public class Configuration {
*/
boolean firstJavaFile = true;
File[] files = directory.listFiles();
if (files == null) {
return;
}
File[] files = directory.listFiles();
if (files == null) {
return;
}
for (File file : files) {
// Trim preceding "./" from path.
String path = file.getPath().substring(2);
// Keep track of source roots for .java files.
if (path.endsWith(".java") && !file.isDirectory()) {
if (file.isDirectory()) {
// Traverse nested directories.
if (excludes.exclude(path)) {
// Don't recurse into excluded dirs.
Log.debug("Excluding: " + path);
excludedDirs.add(file);
} else {
traverse(file, sourceRoots, jarFiles, excludedDirs,
excludes);
}
} else if (path.endsWith(".java")) {
// Keep track of source roots for .java files.
// Do not check excludes in this branch.
if (firstJavaFile) {
// Only parse one .java file per directory.
firstJavaFile = false;
@@ -142,30 +153,12 @@ public class Configuration {
sourceRoots.add(sourceRoot);
}
}
continue;
}
// Keep track of .jar files.
if (path.endsWith(".jar")) {
if (!excludes.exclude(path)) {
jarFiles.add(file);
} else {
Log.debug("Skipped: " + file);
}
continue;
}
// Traverse nested directories.
if (file.isDirectory()) {
} else if (path.endsWith(".jar")) {
// Keep track of .jar files.
if (excludes.exclude(path)) {
// Don't recurse into excluded dirs.
Log.debug("Excluding: " + path);
excludedDirs.add(file);
Log.debug("Skipped: " + file);
} else {
traverse(file, sourceRoots, jarFiles, excludedDirs,
excludes);
jarFiles.add(file);
}
}
}