aboutsummaryrefslogtreecommitdiffstats
path: root/anttasks/src/com/android/ant/NewSetupTask.java
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-08-23 16:28:21 -0700
committerXavier Ducrohet <xav@android.com>2011-08-23 18:39:41 -0700
commit51036711f744664c46a178aac458bb0cc8fa2c63 (patch)
tree582d59d05b0e9d14331de97efa7f442185370ae8 /anttasks/src/com/android/ant/NewSetupTask.java
parent8c68a65be09bfcc4b412bd57af86a0431efc635f (diff)
downloadsdk-51036711f744664c46a178aac458bb0cc8fa2c63.zip
sdk-51036711f744664c46a178aac458bb0cc8fa2c63.tar.gz
sdk-51036711f744664c46a178aac458bb0cc8fa2c63.tar.bz2
Rename default.prop/build.prop to project.prop/ant.prop
Opening projects in Eclipse will rename the file and "android update project" will do the same. Change-Id: I251881897c251eb07c9704eb9c2448cab47e5b83
Diffstat (limited to 'anttasks/src/com/android/ant/NewSetupTask.java')
-rw-r--r--anttasks/src/com/android/ant/NewSetupTask.java12
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) {