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

1 files changed, 12 insertions, 2 deletions

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;

             }