Fix classpath for eclipse.
Change-Id: I3123a2e01289f26d89cef9ce77d50b58a6fc5092
diff --git a/.classpath b/.classpath
index 0c2bca0..fd31dde 100644
--- a/.classpath
+++ b/.classpath
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="hamcrest"/>
+ <classpathentry kind="src" path="protobuf"/>
+ <classpathentry kind="src" path="jline"/>
+ <classpathentry kind="src" path="junit"/>
<classpathentry kind="src" path="proto_gen"/>
<classpathentry kind="src" path="res"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar"/>
<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/sdklib/sdklib-prebuilt.jar"/>
<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/sdk/tools/jack-jacoco-reporter.jar"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/jline-1.0_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/jline/src"/>
<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/commons-compress/commons-compress-prebuilt.jar"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/host-libprotobuf-java-full_intermediates/javalib.jar"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/junit-host_intermediates/javalib.jar"/>
+ <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/devtools-annotations/devtools-annotations-prebuilt.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/tf-remote-client"/>
<classpathentry combineaccessrules="false" kind="src" path="/loganalysis"/>
diff --git a/.project b/.project
index 8f9d7a0..5a0fb95 100644
--- a/.project
+++ b/.project
@@ -16,9 +16,29 @@
</natures>
<linkedResources>
<link>
+ <name>hamcrest</name>
+ <type>2</type>
+ <location>TRADEFED_ROOT/external/hamcrest/hamcrest-core/src/main/java</location>
+ </link>
+ <link>
+ <name>jline</name>
+ <type>2</type>
+ <locationURI>TRADEFED_ROOT/external/jline/src/src/main/java</locationURI>
+ </link>
+ <link>
+ <name>junit</name>
+ <type>2</type>
+ <locationURI>TRADEFED_ROOT/external/junit/src/main/java</locationURI>
+ </link>
+ <link>
<name>proto_gen</name>
<type>2</type>
<locationURI>TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/tradefed-protos_intermediates/proto/src</locationURI>
</link>
+ <link>
+ <name>protobuf</name>
+ <type>2</type>
+ <locationURI>TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/host-libprotobuf-java-full_intermediates/proto/src</locationURI>
+ </link>
</linkedResources>
</projectDescription>
diff --git a/prod-tests/.classpath b/prod-tests/.classpath
index 06cda22..8575dc0 100644
--- a/prod-tests/.classpath
+++ b/prod-tests/.classpath
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="junit"/>
<classpathentry kind="src" path="res"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/tradefederation"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/junit-host_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/junit/src"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
<classpathentry combineaccessrules="false" kind="src" path="/loganalysis"/>
<classpathentry kind="output" path="bin"/>
diff --git a/prod-tests/.project b/prod-tests/.project
index 7e30218..41299f2 100644
--- a/prod-tests/.project
+++ b/prod-tests/.project
@@ -14,4 +14,11 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>junit</name>
+ <type>2</type>
+ <location>TRADEFED_ROOT/external/junit/src/main/java</location>
+ </link>
+ </linkedResources>
</projectDescription>
diff --git a/prod-tests/tests/.classpath b/prod-tests/tests/.classpath
index bf08cdd..0b5e2ca 100644
--- a/prod-tests/tests/.classpath
+++ b/prod-tests/tests/.classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="easymock"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/tf-prod-tests"/>
- <classpathentry kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/easymock_intermediates/javalib.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/tradefederation"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
<classpathentry kind="output" path="bin"/>
diff --git a/prod-tests/tests/.project b/prod-tests/tests/.project
index 4c9b068..b371502 100644
--- a/prod-tests/tests/.project
+++ b/prod-tests/tests/.project
@@ -14,4 +14,11 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>easymock</name>
+ <type>2</type>
+ <location>TRADEFED_ROOT/external/easymock/src</location>
+ </link>
+ </linkedResources>
</projectDescription>
diff --git a/remote/.classpath b/remote/.classpath
index 959973e..49075be 100644
--- a/remote/.classpath
+++ b/remote/.classpath
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="jsr305"/>
+ <classpathentry kind="src" path="guava"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/guava/guava-18.0.jar"/>
+ <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/guava/guava-18.0.jar"/>
<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/json/json-prebuilt.jar"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/sdklib/sdklib-prebuilt.jar"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/guavalib_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/guava/guava/src"/>
+ <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/sdklib/sdklib-prebuilt.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/jsr305lib_intermediates/javalib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/remote/.project b/remote/.project
index 39f7e18..f007f86 100644
--- a/remote/.project
+++ b/remote/.project
@@ -14,4 +14,16 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>guava</name>
+ <type>2</type>
+ <location>TRADEFED_ROOT/external/guava/guava/src</location>
+ </link>
+ <link>
+ <name>jsr305</name>
+ <type>2</type>
+ <location>TRADEFED_ROOT/external/jsr305/ri/src/main/java</location>
+ </link>
+ </linkedResources>
</projectDescription>
diff --git a/tests/.classpath b/tests/.classpath
index 78b31a2..be36dd7 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="objenesis"/>
+ <classpathentry kind="src" path="mockito"/>
+ <classpathentry kind="src" path="protobuf"/>
+ <classpathentry kind="src" path="easymock"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/tradefederation"/>
<classpathentry kind="src" path="res"/>
<classpathentry kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/sdklib/sdklib-prebuilt.jar"/>
<classpathentry kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/tools-common/tools-common-prebuilt.jar"/>
- <classpathentry kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/host-libprotobuf-java-full_intermediates/javalib.jar"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/easymock_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/easymock/src"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/mockito-host_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/mockito/src"/>
- <classpathentry exported="true" kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/objenesis-host_intermediates/javalib.jar" sourcepath="/TRADEFED_ROOT/external/objenesis/tck/src"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
<classpathentry combineaccessrules="false" kind="src" path="/tf-remote-client"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="var" path="TRADEFED_ROOT/external/mockito/lib/byte-buddy-1.6.9.jar"/>
+ <classpathentry kind="var" path="TRADEFED_ROOT/external/mockito/lib/byte-buddy-agent-1.6.9.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/.project b/tests/.project
index 3dbb3f3..a268679 100644
--- a/tests/.project
+++ b/tests/.project
@@ -14,4 +14,26 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>easymock</name>
+ <type>2</type>
+ <locationURI>TRADEFED_ROOT/external/easymock/src</locationURI>
+ </link>
+ <link>
+ <name>mockito</name>
+ <type>2</type>
+ <locationURI>TRADEFED_ROOT/external/mockito/src/main/java</locationURI>
+ </link>
+ <link>
+ <name>objenesis</name>
+ <type>2</type>
+ <location>TRADEFED_ROOT/external/objenesis/main/src/main/java</location>
+ </link>
+ <link>
+ <name>protobuf</name>
+ <type>2</type>
+ <location>TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/host-libprotobuf-java-full_intermediates/proto/src</location>
+ </link>
+ </linkedResources>
</projectDescription>