diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-03-18 14:14:53 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2013-03-18 14:15:34 -0700 |
| commit | 7cde8142e34bff83ea98db37f16067574ccacb3f (patch) | |
| tree | 60f14eda24765ea1afec6d0a8898a6e4a9f8de7b | |
| parent | 25854d5be8ded02ab25042e28c574462035e92e2 (diff) | |
| download | base-7cde8142e34bff83ea98db37f16067574ccacb3f.tar.gz | |
Fix eclipse project dependencies.
- Use the prebuilts from the maven repo
- Make each project exports its dependencies to avoid having to
redefine them in all projects.
Change-Id: Ie95ce6902ba9aac6d03851ede2731151db0e773d
| -rw-r--r-- | asset-studio/.classpath | 1 | ||||
| -rw-r--r-- | common/.classpath | 2 | ||||
| -rw-r--r-- | ddmlib/.classpath | 11 | ||||
| -rw-r--r-- | ddmlib/build.gradle | 2 | ||||
| -rw-r--r-- | layoutlib-api/.classpath | 2 | ||||
| -rw-r--r-- | legacy/ant-tasks/.classpath | 3 | ||||
| -rw-r--r-- | lint/cli/.classpath | 11 | ||||
| -rw-r--r-- | lint/cli/build.gradle | 1 | ||||
| -rw-r--r-- | lint/libs/lint-api/.classpath | 15 | ||||
| -rw-r--r-- | lint/libs/lint-checks/.classpath | 13 | ||||
| -rw-r--r-- | misc/apigenerator/.classpath | 6 | ||||
| -rw-r--r-- | sdk-common/.classpath | 8 | ||||
| -rw-r--r-- | sdklib/.classpath | 19 | ||||
| -rw-r--r-- | testutils/.classpath | 3 |
14 files changed, 36 insertions, 61 deletions
diff --git a/asset-studio/.classpath b/asset-studio/.classpath index 973f09a46d..c33563b764 100644 --- a/asset-studio/.classpath +++ b/asset-studio/.classpath @@ -4,7 +4,6 @@ <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry 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 combineaccessrules="false" kind="src" path="/layoutlib-api"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="output" path="bin"/> diff --git a/common/.classpath b/common/.classpath index 5f63122850..39a3f56edf 100644 --- a/common/.classpath +++ b/common/.classpath @@ -3,6 +3,6 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry 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 exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/google/guava/guava/13.0.1/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/ddmlib/.classpath b/ddmlib/.classpath index 027eace163..4329a33221 100644 --- a/ddmlib/.classpath +++ b/ddmlib/.classpath @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="Android.mk" kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar"/> - <classpathentry 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"/> + <classpathentry excluding="Android.mk" kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/ddmlib/build.gradle b/ddmlib/build.gradle index d01831a4d3..15e0e7b77f 100644 --- a/ddmlib/build.gradle +++ b/ddmlib/build.gradle @@ -4,7 +4,7 @@ archivesBaseName = 'ddmlib' dependencies { compile project(':common') - compile 'kxml2:kxml2:2.3.0' + compile 'net.sf.kxml2:kxml2:2.3.0' testCompile 'org.easymock:easymock:3.1' testCompile 'junit:junit:3.8.1' diff --git a/layoutlib-api/.classpath b/layoutlib-api/.classpath index d7c9d12e4a..7b6cd60fd1 100644 --- a/layoutlib-api/.classpath +++ b/layoutlib-api/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/legacy/ant-tasks/.classpath b/legacy/ant-tasks/.classpath index 3f9e93a5f0..56e966601d 100644 --- a/legacy/ant-tasks/.classpath +++ b/legacy/ant-tasks/.classpath @@ -3,9 +3,8 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/sdklib"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/ant/ant.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/internal/org/apache/ant/ant/1.8.0/ant-1.8.0.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry 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 combineaccessrules="false" kind="src" path="/manifest-merger"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/lint/cli/.classpath b/lint/cli/.classpath index 83b4a06d86..5c82f16369 100644 --- a/lint/cli/.classpath +++ b/lint/cli/.classpath @@ -2,15 +2,6 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/sdk-common"/> - <classpathentry combineaccessrules="false" kind="src" path="/lint-api"/> - <classpathentry combineaccessrules="false" kind="src" path="/lint-checks"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src-4.0.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-4.0.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-4.0.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src-4.0.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-4.0.zip"/> - <classpathentry combineaccessrules="false" kind="src" path="/sdklib"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/lint-checks"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/lint/cli/build.gradle b/lint/cli/build.gradle index b06a642148..5993e61e64 100644 --- a/lint/cli/build.gradle +++ b/lint/cli/build.gradle @@ -2,7 +2,6 @@ group = 'com.android.tools.lint' archivesBaseName = 'lint' dependencies { - compile project(':lint-api') compile project(':lint-checks') testCompile 'org.easymock:easymock:3.1' diff --git a/lint/libs/lint-api/.classpath b/lint/libs/lint-api/.classpath index da89dffddc..cc6f6b7ce8 100644 --- a/lint/libs/lint-api/.classpath +++ b/lint/libs/lint-api/.classpath @@ -2,13 +2,12 @@ <classpath> <classpathentry excluding="Android.mk" kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/sdk-common"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src-4.0.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-4.0.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src-4.0.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-4.0.zip"/> - <classpathentry combineaccessrules="false" kind="src" path="/layoutlib-api"/> - <classpathentry combineaccessrules="false" kind="src" path="/sdklib"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/sdk-common"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm/4.0/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm/4.0/asm-4.0-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src-4.0.zip"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/layoutlib-api"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/sdklib"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/lint/libs/lint-checks/.classpath b/lint/libs/lint-checks/.classpath index 197225ecf6..5772c741f4 100644 --- a/lint/libs/lint-checks/.classpath +++ b/lint/libs/lint-checks/.classpath @@ -2,15 +2,8 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/lint-api"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src-4.0.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-4.0.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-4.0.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src-4.0.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-4.0.zip"/> - <classpathentry combineaccessrules="false" kind="src" path="/layoutlib-api"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/sdk-common"/> - <classpathentry combineaccessrules="false" kind="src" path="/sdklib"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/lint-api"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src-4.0.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/misc/apigenerator/.classpath b/misc/apigenerator/.classpath index e523a44490..d9b351abf9 100644 --- a/misc/apigenerator/.classpath +++ b/misc/apigenerator/.classpath @@ -2,9 +2,9 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm/tools/src-4.0.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm/4.0/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm/4.0/asm-4.0-sources.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0-sources.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/sdk-common/.classpath b/sdk-common/.classpath index a38989b79d..5218b93dcd 100644 --- a/sdk-common/.classpath +++ b/sdk-common/.classpath @@ -3,11 +3,9 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/layoutlib-api"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/> - <classpathentry 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 combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/sdklib"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/layoutlib-api"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/sdklib"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/sdklib/.classpath b/sdklib/.classpath index ac0816e5c5..a441584875 100644 --- a/sdklib/.classpath +++ b/sdklib/.classpath @@ -4,16 +4,15 @@ <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/commons-compress/commons-compress-1.0.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/commons-codec-1.4.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/commons-logging-1.1.1.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpclient-4.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpcore-4.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/http-client/httpmime-4.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip"/> - <classpathentry 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 combineaccessrules="false" kind="src" path="/dvlib"/> - <classpathentry combineaccessrules="false" kind="src" path="/layoutlib-api"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/commons/commons-compress/1.0/commons-compress-1.0-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/dvlib"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/layoutlib-api"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar"/> <classpathentry kind="output" path="bin"/> diff --git a/testutils/.classpath b/testutils/.classpath index 313424171c..cfe92c7509 100644 --- a/testutils/.classpath +++ b/testutils/.classpath @@ -3,7 +3,6 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry 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 combineaccessrules="false" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/> <classpathentry kind="output" path="bin"/> </classpath> |