From 12523bc43ba8e25c542c09463ef0e44054b0f47d Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 22 Jan 2012 12:02:57 -0800 Subject: ADT: Fix "Add compatability library" 2 issues: - the code was still trying to look for the obsolete "compatibility" export instead of the new "support". - the install filter did not support the pkg attribute. SDK Issue: 21488 Change-Id: Ie083b008d9ecdb9467a1b203c7602b5cc8c0580d --- .../internal/repository/sdkman2/AdtUpdateDialog.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'sdkmanager/libs') 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 field first + if (ep.getPath().equals(mPath)) { + return true; + } + // If not, check whether this is one of the values. + for (String oldPath : ep.getOldPaths()) { + if (oldPath.equals(mPath)) { + return true; + } + } + } } return false; } -- cgit v1.1