From 51036711f744664c46a178aac458bb0cc8fa2c63 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 23 Aug 2011 16:28:21 -0700 Subject: 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 --- anttasks/src/com/android/ant/AaptExecLoopTask.java | 2 +- anttasks/src/com/android/ant/NewSetupTask.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'anttasks') diff --git a/anttasks/src/com/android/ant/AaptExecLoopTask.java b/anttasks/src/com/android/ant/AaptExecLoopTask.java index 7b7d82d..8a593f9 100644 --- a/anttasks/src/com/android/ant/AaptExecLoopTask.java +++ b/anttasks/src/com/android/ant/AaptExecLoopTask.java @@ -272,7 +272,7 @@ public final class AaptExecLoopTask extends BaseTask { /* * (non-Javadoc) * - * Executes the loop. Based on the values inside default.properties, this will + * Executes the loop. Based on the values inside project.properties, this will * create alternate temporary ap_ files. * * @see org.apache.tools.ant.Task#execute() 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 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) { -- cgit v1.1