diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-03-18 17:18:15 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2013-03-18 17:40:03 -0700 |
| commit | 9aacc569302d96bff2cf2790be3ec89ca65beeb5 (patch) | |
| tree | d5bbaabc814d67f4b37bed610231fa75039e9c84 /eclipse/plugins | |
| parent | 4e6beeb31ef0fb5508eb7ec885fc3be776acf483 (diff) | |
| download | sdk-9aacc569302d96bff2cf2790be3ec89ca65beeb5.zip sdk-9aacc569302d96bff2cf2790be3ec89ca65beeb5.tar.gz sdk-9aacc569302d96bff2cf2790be3ec89ca65beeb5.tar.bz2 | |
Fix dependencies of adt plugins to depend on the right prebuilts.
Change-Id: Ibf8919eb96d9d026988bd2d97972e35aa0c9ae2f
Diffstat (limited to 'eclipse/plugins')
4 files changed, 10 insertions, 9 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath index a0396bc..89b762f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath @@ -12,10 +12,11 @@ <classpathentry exported="true" kind="lib" path="libs/ant-glob.jar"/> <classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.19.jar"/> <classpathentry exported="true" kind="lib" path="libs/manifest-merger.jar" sourcepath="/ManifestMerger"/> - <classpathentry kind="var" path="ANDROID_SRC/sdk/eclipse/plugins/com.android.ide.eclipse.adt/libs/propertysheet.jar" sourcepath="/ANDROID_SRC/external/eclipse-windowbuilder/propertysheet/src"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-analysis-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> + <classpathentry exported="true" kind="lib" path="libs/lombok-ast-0.2.jar"/> + <classpathentry exported="true" kind="lib" path="libs/propertysheet.jar"/> + <classpathentry exported="true" kind="lib" path="libs/asm-4.0.jar"/> + <classpathentry exported="true" kind="lib" path="libs/asm-analysis-4.0.jar"/> + <classpathentry exported="true" kind="lib" path="libs/asm-tree-4.0.jar"/> + <classpathentry exported="true" kind="lib" path="libs/swtmenubar.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath index c0ddc3c..81461ed 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath @@ -10,7 +10,6 @@ <classpathentry exported="true" kind="lib" path="libs/guava-13.0.1.jar"/> <classpathentry exported="true" kind="lib" path="libs/httpclient-4.1.1.jar"/> <classpathentry exported="true" kind="lib" path="libs/httpcore-4.1.jar"/> - <classpathentry exported="true" kind="lib" path="libs/httpmime-4.1.1.jar"/> <classpathentry exported="true" kind="lib" path="libs/kxml2-2.3.0.jar"/> <classpathentry exported="true" kind="lib" path="libs/layoutlib-api.jar" sourcepath="/layoutlib-api"/> <classpathentry exported="true" kind="lib" path="libs/sdklib.jar" sourcepath="/sdklib"/> @@ -19,6 +18,5 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="output" path="bin"/> </classpath> 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 0a01a54..4d42a1a 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 @@ -15,7 +15,7 @@ Bundle-ClassPath: ., libs/guava-13.0.1.jar, libs/httpclient-4.1.1.jar, libs/httpcore-4.1.jar, - libs/httpmime-4.1.1.jar, + libs/httpmime-4.1.jar, libs/kxml2-2.3.0.jar, libs/layoutlib-api.jar, libs/sdklib.jar, @@ -26,6 +26,7 @@ Bundle-ClassPath: ., libs/bcprov-jdk15on-1.48.jar Export-Package: com.android, com.android.annotations, + com.android.annotations.concurrency, com.android.dvlib, com.android.ide.common.rendering, com.android.ide.common.rendering.api, @@ -50,6 +51,7 @@ Export-Package: com.android, com.android.sdklib.internal.repository.archives, com.android.sdklib.internal.repository.packages, com.android.sdklib.internal.repository.sources, + com.android.sdklib.internal.repository.updater, com.android.sdklib.io, com.android.sdklib.repository, com.android.sdklib.util, diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath b/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath index 1ae72a4..a51b125 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath @@ -6,8 +6,8 @@ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="libs/jfreechart-1.0.9.jar"/> <classpathentry kind="lib" path="libs/jcommon-1.0.12.jar"/> - <classpathentry kind="lib" path="libs/jfreechart-1.0.9-swt.jar"/> <classpathentry exported="true" kind="lib" path="libs/ddmlib.jar" sourcepath="/ddmlib"/> <classpathentry exported="true" kind="lib" path="libs/ddmuilib.jar" sourcepath="/ddmuilib"/> + <classpathentry kind="lib" path="libs/jfreechart-swt-1.0.9.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |