diff options
Diffstat (limited to 'anttasks/src/com/android/ant/NewSetupTask.java')
| -rw-r--r-- | anttasks/src/com/android/ant/NewSetupTask.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/anttasks/src/com/android/ant/NewSetupTask.java b/anttasks/src/com/android/ant/NewSetupTask.java index 49e8595..c0e8d2a 100644 --- a/anttasks/src/com/android/ant/NewSetupTask.java +++ b/anttasks/src/com/android/ant/NewSetupTask.java @@ -538,13 +538,13 @@ public class NewSetupTask extends Task { File library = inLibraries.get(i); // get the default.property file for it - final ProjectProperties defaultProp = ProjectProperties.load( - new FolderWrapper(library), PropertyType.DEFAULT); + final ProjectProperties projectProp = ProjectProperties.load( + new FolderWrapper(library), PropertyType.PROJECT); // get its libraries List<File> dependencies = getDirectDependencies(library, new IPropertySource() { public String getProperty(String name) { - return defaultProp.getProperty(name); + return projectProp.getProperty(name); } }); @@ -585,12 +585,12 @@ public class NewSetupTask extends Task { File library = new File(baseFolder, rootPath).getCanonicalFile(); // check for validity - File defaultProp = new File(library, PropertyType.DEFAULT.getFilename()); - if (defaultProp.isFile() == false) { + File projectProp = new File(library, PropertyType.PROJECT.getFilename()); + if (projectProp.isFile() == false) { // error! throw new BuildException(String.format( "%1$s resolve to a path with no %2$s file for project %3$s", rootPath, - PropertyType.DEFAULT.getFilename(), baseFolder.getAbsolutePath())); + PropertyType.PROJECT.getFilename(), baseFolder.getAbsolutePath())); } if (libraries.contains(library) == false) { |