Merge "Fix various classpath issues in Jack projects" into jack-wip-dev
diff --git a/dexcomparator/.classpath b/dexcomparator/.classpath
index e756a65..0aadac8 100644
--- a/dexcomparator/.classpath
+++ b/dexcomparator/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/dx-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/dx/src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Dx"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/dexlib-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/dexlib/src/main/java"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/jsr305lib-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/jsr305/ri/src/main/java"/>
 	<classpathentry kind="src" path=".apt_generated">
diff --git a/jack-tests/.classpath b/jack-tests/.classpath
index 8fdd9a0..141703b 100644
--- a/jack-tests/.classpath
+++ b/jack-tests/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry excluding="com/android/jack/classpath/test002/lib1override/|com/android/jack/enums/test003/link/Other.java|com/android/jack/enums/test003/link/Values.java|com/android/jack/error/test001/jack/A.java|com/android/jack/error/test002/jack/A.java|com/android/jack/nopackage/jack/|com/android/jack/java7/switches/|com/android/jack/java7/exceptions/|com/android/jack/java7/trywithresources/|com/android/jack/java7/parser/" kind="src" path="tests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/junit4-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/junit4/src/main/java"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jack/.classpath b/jack/.classpath
index 5c04f98..f420493 100644
--- a/jack/.classpath
+++ b/jack/.classpath
@@ -7,6 +7,7 @@
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/ecj-jack_intermediates/javalib.jar"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/guava-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/guava/src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Dx"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/dexcomparator"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/dx_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/dx/src"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/dexlib-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/dexlib/src/main/java"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Scheduler"/>
@@ -19,6 +20,5 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/dexcomparator_intermediates/javalib.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/sched/.classpath b/sched/.classpath
index 434884e..f9aa32b 100644
--- a/sched/.classpath
+++ b/sched/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry excluding="com/android/sched/util/log/tracer/SpeedTracer.java" kind="src" path="src"/>
 	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="src" path="rsc"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/guava-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/guava/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/freemarker-jack_intermediates/javalib.jar"/>
@@ -11,6 +10,7 @@
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/watchmaker-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/watchmaker/framework/src"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/maths-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/maths/core/src"/>
 	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/jsr305lib-jack_intermediates/javalib.jar"/>
+	<classpathentry kind="var" path="ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/junit4-jack_intermediates/javalib.jar" sourcepath="/ANDROID_BUILD_TOP/toolchain/jack/junit4/src/main/java"/>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>