aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2014-01-17 18:45:47 -0800
committerRaphael Moll <ralf@android.com>2014-01-17 18:45:47 -0800
commit688710ff8e59b8cc88a5a619d7ee9741b82da4f8 (patch)
tree446e1b62866034696cda8681697795bda610b880 /eclipse
parent7ce0eb5c4e8faffa7b4cb8a5b3fd1917dbc19a69 (diff)
downloadsdk-688710ff8e59b8cc88a5a619d7ee9741b82da4f8.zip
sdk-688710ff8e59b8cc88a5a619d7ee9741b82da4f8.tar.gz
sdk-688710ff8e59b8cc88a5a619d7ee9741b82da4f8.tar.bz2
AvdManager: use File for getLocation.
Change-Id: I38049360b416fcc3426df3724a2d058483743c6d
Diffstat (limited to 'eclipse')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java4
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF3
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 6d80a9c..1a209d5 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,