Revert "Removes dartc reliance on its own libraries, now can be targeted at any implementation's li…

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index fdd5247a16afcdb2189cd8114e586c60d4967d76..4bbd4f41e68941e3fa7c5691e16e3c0937fc745e 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -995,11 +995,12 @@ class JUnitTestSuite implements TestSuite {
   }
 
   void createTest(successIgnored) {
-    var sdkDir = "$buildDir/dart-sdk".trim();
+    String d8 =
+        "$buildDir/d8${TestUtils.executableSuffix(configuration['component'])}";
     List<String> args = <String>[
         '-ea',
         '-classpath', classPath,
-        '-Dcom.google.dart.sdk=$sdkDir',
+        '-Dcom.google.dart.runner.d8=$d8',
         '-Dcom.google.dart.corelib.SharedTests.test_py=' +
             dartDir + '/tools/test.py',
         'org.junit.runner.JUnitCore'];
@@ -1019,11 +1020,13 @@ class JUnitTestSuite implements TestSuite {
   void computeClassPath() {
     classPath = Strings.join(
         ['$buildDir/compiler/lib/dartc.jar',
+         '$buildDir/compiler/lib/corelib.jar',
          '$buildDir/compiler-tests.jar',
          '$buildDir/closure_out/compiler.jar',
          // Third party libraries.
          '$dartDir/third_party/args4j/2.0.12/args4j-2.0.12.jar',
          '$dartDir/third_party/guava/r09/guava-r09.jar',
+         '$dartDir/third_party/json/r2_20080312/json.jar',
          '$dartDir/third_party/rhino/1_7R3/js.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar',