ADT: Fix "Add compatability library"

2 issues:
- the code was still trying to look for the obsolete
  "compatibility" export <path> instead of the new "support".
- the install filter did not support the <old-path> pkg attribute.

SDK Issue: 21488

Change-Id: Ie083b008d9ecdb9467a1b203c7602b5cc8c0580d

3 files changed, 15 insertions, 3 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddCompatibilityJarAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddCompatibilityJarAction.java
index 370064e..b758b67 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddCompatibilityJarAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddCompatibilityJarAction.java
@@ -136,7 +136,7 @@ public class AddCompatibilityJarAction implements IObjectActionDelegate {
                 sdk.getSdkLocation());
 
         Pair<Boolean, File> result = window.installExtraPackage(
-                "android", "compatibility");    //$NON-NLS-1$ //$NON-NLS-2$
+                "android", "support");    //$NON-NLS-1$ //$NON-NLS-2$
 
         if (!result.getFirst().booleanValue()) {
             AdtPlugin.printErrorToConsole("Failed to install Android Compatibility library");
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
index 4a71e37..ce37d61 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
@@ -221,6 +221,8 @@ public class PreCompilerBuilder extends BaseBuilder {
         IProject[] result = null;
 
         try {
+            assert mDerivedProgressMonitor != null;
+
             mDerivedProgressMonitor.reset();
 
             // get the project info
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
index ca1159d..dce4110 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
@@ -309,8 +309,18 @@ public class AdtUpdateDialog extends SwtBaseDialog {
             boolean accept(Package pkg) {

                 if (pkg instanceof ExtraPackage) {

                     ExtraPackage ep = (ExtraPackage) pkg;

-                    return ep.getVendor().equals(mVendor) &&

-                           ep.getPath().equals(mPath);

+                    if (ep.getVendor().equals(mVendor)) {

+                        // Check actual extra <path> field first

+                        if (ep.getPath().equals(mPath)) {

+                            return true;

+                        }

+                        // If not, check whether this is one of the <old-paths> values.

+                        for (String oldPath : ep.getOldPaths()) {

+                            if (oldPath.equals(mPath)) {

+                                return true;

+                            }

+                        }

+                    }

                 }

                 return false;

             }