Merge "Fix dependencies of adt plugins to depend on the right prebuilts."
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 @@
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 @@
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 @@
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>
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index 6638e38..925bc70 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -101,7 +101,6 @@
DEST="sdk/eclipse/scripts"
set -e # fail early
-
LIBS=""
CP_FILES=""
@@ -111,14 +110,14 @@
BASE_PLUGIN_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.base/libs"
BASE_PLUGIN_LIBS="common sdkstats sdklib dvlib layoutlib-api sdk-common"
BASE_PLUGIN_PREBUILTS="\
- prebuilts/misc/common/kxml2/kxml2-2.3.0.jar \
- prebuilts/tools/common/commons-compress/commons-compress-1.0.jar \
- prebuilts/tools/common/guava-tools/guava-13.0.1.jar \
- prebuilts/tools/common/http-client/commons-logging-1.1.1.jar \
- prebuilts/tools/common/http-client/commons-codec-1.4.jar \
- prebuilts/tools/common/http-client/httpclient-4.1.1.jar \
- prebuilts/tools/common/http-client/httpcore-4.1.jar \
- prebuilts/tools/common/http-client/httpmime-4.1.1.jar \
+ prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar \
+ prebuilts/tools/common/m2/repository/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar \
+ prebuilts/tools/common/m2/repository/com/google/guava/guava/13.0.1/guava-13.0.1.jar \
+ prebuilts/tools/common/m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar \
+ prebuilts/tools/common/m2/repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar \
+ prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar \
+ prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar \
+ prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar \
prebuilts/tools/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar \
prebuilts/tools/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar"
@@ -132,9 +131,9 @@
ADT_LIBS="ant-glob asset-studio lint-api lint-checks ninepatch propertysheet rule-api sdkuilib swtmenubar manifest-merger"
ADT_PREBUILTS="\
prebuilts/tools/common/freemarker/freemarker-2.3.19.jar \
- prebuilts/tools/common/asm-tools/asm-4.0.jar \
- prebuilts/tools/common/asm-tools/asm-tree-4.0.jar \
- prebuilts/tools/common/asm-tools/asm-analysis-4.0.jar \
+ prebuilts/tools/common/m2/repository/org/ow2/asm/asm/4.0/asm-4.0.jar \
+ prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar \
+ prebuilts/tools/common/m2/repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar \
prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar"
LIBS="$LIBS $ADT_LIBS"
@@ -147,9 +146,9 @@
DDMS_LIBS="ddmlib ddmuilib swtmenubar uiautomatorviewer"
DDMS_PREBUILTS="\
- prebuilts/tools/common/jfreechart/jcommon-1.0.12.jar \
- prebuilts/tools/common/jfreechart/jfreechart-1.0.9.jar \
- prebuilts/tools/common/jfreechart/jfreechart-1.0.9-swt.jar"
+ prebuilts/tools/common/m2/repository/jfree/jcommon/1.0.12/jcommon-1.0.12.jar \
+ prebuilts/tools/common/m2/repository/jfree/jfreechart/1.0.9/jfreechart-1.0.9.jar \
+ prebuilts/tools/common/m2/repository/jfree/jfreechart-swt/1.0.9/jfreechart-swt-1.0.9.jar"
LIBS="$LIBS $DDMS_LIBS"
CP_FILES="$CP_FILES @:$DDMS_DEST $DDMS_LIBS $DDMS_PREBUILTS"
@@ -159,7 +158,7 @@
TEST_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.tests"
TEST_LIBS="easymock sdktestutils"
-TEST_PREBUILTS="prebuilts/misc/common/kxml2/kxml2-2.3.0.jar"
+TEST_PREBUILTS="prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar"
LIBS="$LIBS $TEST_LIBS"
CP_FILES="$CP_FILES @:$TEST_DEST $TEST_LIBS $TEST_PREBUILTS"
