Project property cleanup.

Remove obsolete sdk-location on project update, don't
use it as backup location anymore (main_rules.xml won't work with
it anyway).

Remove the old application.package properties since older platforms
will use the new rules anyway.

Change-Id: I5a5ec3d1289cf793dd0f98fb778bd84086976c52

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);