aboutsummaryrefslogtreecommitdiffstats
path: root/anttasks
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-10-15 14:04:46 -0700
committerAndroid Code Review <code-review@android.com>2010-10-15 14:04:46 -0700
commite8e6a2fd82d59a8546f3155fcc11e824ebbb5157 (patch)
tree5d71b51a0b04668ca3e60a9da0ba66d1b1e89d10 /anttasks
parente6b5bb251543b08ff37e91655cac7010ca5a0be8 (diff)
parent2c4736e46119e7eeb64066ace92c3341ec2d2f62 (diff)
downloadsdk-e8e6a2fd82d59a8546f3155fcc11e824ebbb5157.zip
sdk-e8e6a2fd82d59a8546f3155fcc11e824ebbb5157.tar.gz
sdk-e8e6a2fd82d59a8546f3155fcc11e824ebbb5157.tar.bz2
Merge "Project property cleanup."
Diffstat (limited to 'anttasks')
-rw-r--r--anttasks/src/com/android/ant/TaskHelper.java13
1 files changed, 1 insertions, 12 deletions
diff --git a/anttasks/src/com/android/ant/TaskHelper.java b/anttasks/src/com/android/ant/TaskHelper.java
index 8c50e49..a360eaf 100644
--- a/anttasks/src/com/android/ant/TaskHelper.java
+++ b/anttasks/src/com/android/ant/TaskHelper.java
@@ -37,18 +37,7 @@ final class TaskHelper {
// check if it's valid and exists
if (sdkOsPath == null || sdkOsPath.length() == 0) {
- // LEGACY support: project created with 1.6 or before may be using a different
- // property to declare the location of the SDK. At this point, we cannot
- // yet check which target is running so we check both always.
- sdkOsPath = antProject.getProperty(ProjectProperties.PROPERTY_SDK_LEGACY);
- if (sdkOsPath == null || sdkOsPath.length() == 0) {
- throw new BuildException("SDK Location is not set.");
- }
- }
-
- // Make sure the OS sdk path ends with a directory separator
- if (sdkOsPath.length() > 0 && !sdkOsPath.endsWith(File.separator)) {
- sdkOsPath += File.separator;
+ throw new BuildException("SDK Location is not set.");
}
File sdk = new File(sdkOsPath);