diff options
| author | Raphael Moll <ralf@android.com> | 2014-01-18 02:47:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-18 02:47:01 +0000 |
| commit | 62db84142add1d302a3337716a9c4524f242ac08 (patch) | |
| tree | 22d6d93f21c05496bb8ed43c0e04f3a6d328f44d | |
| parent | 4a218a8b31d712290dce83cc65fc0a529fb10823 (diff) | |
| parent | 688710ff8e59b8cc88a5a619d7ee9741b82da4f8 (diff) | |
| download | sdk-62db84142add1d302a3337716a9c4524f242ac08.zip sdk-62db84142add1d302a3337716a9c4524f242ac08.tar.gz sdk-62db84142add1d302a3337716a9c4524f242ac08.tar.bz2 | |
Merge "AvdManager: use File for getLocation." into idea133
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java | 4 | ||||
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java index c8faa5e..1a0e049 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java @@ -282,7 +282,7 @@ public final class Sdk { // create the AVD Manager AvdManager avdManager = null; try { - avdManager = AvdManager.getInstance(manager, log); + avdManager = AvdManager.getInstance(manager.getLocalSdk(), log); } catch (AndroidLocationException e) { log.error(e, "Error parsing the AVDs"); } @@ -901,7 +901,7 @@ public final class Sdk { mDocBaseUrl = getDocumentationBaseUrl(manager.getLocation() + SdkConstants.OS_SDK_DOCS_FOLDER); - mDeviceManager = DeviceManager.createInstance(manager.getLocation(), + mDeviceManager = DeviceManager.createInstance(manager.getLocalSdk().getLocation(), AdtPlugin.getDefault()); // update whatever ProjectState is already present with new IAndroidTarget objects. diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index 9cfbbf1..6a9ba76 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -57,6 +57,9 @@ Export-Package: com.android, com.android.sdklib.internal.repository.updater, com.android.sdklib.io, com.android.sdklib.repository, + com.android.sdklib.repository.descriptors, + com.android.sdklib.repository.local, + com.android.sdklib.repository.remote, com.android.sdklib.util, com.android.sdkstats, com.android.util, |