diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-05-21 21:38:43 -0700 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-05-21 21:45:51 -0700 |
| commit | 0f9c292a689b18cdf72357fa7df1b1b9f10d646f (patch) | |
| tree | cd2e18e0106f2759e23ac2dac15c86a2ca57610f /eclipse/plugins/com.android.ide.eclipse.tests | |
| parent | 9b98309c11b57361f00c845120c13a606d94395b (diff) | |
| download | sdk-0f9c292a689b18cdf72357fa7df1b1b9f10d646f.tar.gz | |
Replace bundled libraries with OSGI bundle dependencies
This CL removes all the jars bundled in inside the libs
folder and adds explicit dependencies on OSGI bundles
for each of the dependencies.
See eec615b94b504de6d87702b830a6fc85fc7d5108 for more
info on how the dependency jars are converted into
OSGI bundles.
Change-Id: I5356edc2ca857ea961392c599fa0e985b16b4b2d
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.tests')
3 files changed, 4 insertions, 31 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath index cce7e3c49..118e6b451 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath @@ -4,21 +4,5 @@ <classpathentry kind="src" path="unittests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="lib" path="kxml2-2.3.0.jar"/> - <classpathentry kind="lib" path="easymock.jar"/> - <classpathentry kind="lib" path="testutils.jar"/> - <classpathentry kind="lib" path="/plugin-adt/libs/ninepatch.jar" sourcepath="/ninepatch"/> - <classpathentry kind="lib" path="/plugin-base/libs/sdklib.jar" sourcepath="/SdkLib"/> - <classpathentry kind="lib" path="/plugin-adt/libs/sdkuilib.jar" sourcepath="/SdkUiLib"/> - <classpathentry kind="lib" path="/plugin-adt/libs/rule-api.jar" sourcepath="/rule-api"/> - <classpathentry kind="lib" path="/plugin-base/libs/common.jar" sourcepath="/common"/> - <classpathentry kind="lib" path="/plugin-adt/libs/lint-api.jar" sourcepath="/lint-api"/> - <classpathentry kind="lib" path="/plugin-adt/libs/lint-checks.jar" sourcepath="/lint-checks"/> - <classpathentry kind="lib" path="/plugin-base/libs/sdk-common.jar"/> - <classpathentry kind="lib" path="/plugin-adt/libs/lombok-ast-0.2.2.jar"/> - <classpathentry kind="lib" path="/plugin-adt/libs/asm-4.0.jar"/> - <classpathentry kind="lib" path="/plugin-adt/libs/asm-analysis-4.0.jar"/> - <classpathentry kind="lib" path="/plugin-adt/libs/asm-tree-4.0.jar"/> - <classpathentry kind="lib" path="/plugin-adt/libs/manifest-merger.jar" sourcepath="/manifest-merger"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF index fc2c92780..75a39f88c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF @@ -5,12 +5,7 @@ Bundle-SymbolicName: com.android.ide.eclipse.tests Bundle-Version: 22.6.2.qualifier Bundle-Vendor: The Android Open Source Project Fragment-Host: com.android.ide.eclipse.adt;bundle-version="21.0.0" -Require-Bundle: org.junit +Require-Bundle: org.junit, + com.android.tools.testutils;bundle-version="22.9.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ClassPath: kxml2-2.3.0.jar, - ., - testutils.jar, - layoutlib.jar, - lint-api.jar, - lint-checks.jar, - easymock.jar +Bundle-ClassPath: . diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties index e8daa3e05..186753b03 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties @@ -6,13 +6,7 @@ bin.includes = META-INF/,\ test.xml,\ prefs.template,\ unittest.xml,\ - kxml2-2.3.0.jar,\ - testutils.jar,\ - layoutlib.jar,\ - lint-api.jar,\ - lint-checks.jar,\ unittests/com/android/sdklib/testdata/,\ unittests/com/android/layoutlib/testdata/,\ - unittests/com/android/ide/eclipse/testdata/,\ - easymock.jar + unittests/com/android/ide/eclipse/testdata/ |