diff options
| author | Raphael <raphael@google.com> | 2012-01-23 11:38:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-23 11:38:00 -0800 |
| commit | 6572948638fe2772910c8523eb2bc77155760abe (patch) | |
| tree | db7694e08ee2fedbd439cb4879c931bb98867a8c | |
| parent | ad56a1874348dbd1f010d8afb807dd39c1d3f835 (diff) | |
| parent | 12523bc43ba8e25c542c09463ef0e44054b0f47d (diff) | |
| download | sdk-6572948638fe2772910c8523eb2bc77155760abe.zip sdk-6572948638fe2772910c8523eb2bc77155760abe.tar.gz sdk-6572948638fe2772910c8523eb2bc77155760abe.tar.bz2 | |
Merge "ADT: Fix "Add compatability library""
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;
}
|