Roll sdk dependency to 34357cdad108dcba734949bd13bd28c76ea285e0

pkg/fletchc/lib/fletch_compiler.dart

Index: pkg/fletchc/lib/fletch_compiler.dart
diff --git a/pkg/fletchc/lib/fletch_compiler.dart b/pkg/fletchc/lib/fletch_compiler.dart
index 17011c898599bf80a194c15e5a7942077bf17288..a0b6efc6b6d2a83d31b321d3f14b4f002d92b2e9 100644
--- a/pkg/fletchc/lib/fletch_compiler.dart
+++ b/pkg/fletchc/lib/fletch_compiler.dart
@@ -122,7 +122,7 @@ class FletchCompiler {
       options.add("--categories=$categoriesOptionValue");
     }
 
-    final bool isVerbose = apiimpl.Compiler.hasOption(options, '--verbose');
+    final bool isVerbose = apiimpl.CompilerImpl.hasOption(options, '--verbose');
 
     if (provider == null) {
       provider = new CompilerSourceFileProvider()
@@ -143,7 +143,7 @@ class FletchCompiler {
       outputProvider = new OutputProvider();
     }
 
-    if (libraryRoot == null  && _LIBRARY_ROOT != null) {
+    if (libraryRoot == null && _LIBRARY_ROOT != null) {
       libraryRoot = executable.resolve(appendSlash(_LIBRARY_ROOT));
     }
     libraryRoot = _computeValidatedUri(
@@ -176,7 +176,7 @@ Try adding command-line option '-Ddart-sdk=<location of the Dart sdk>'.""");
     fletchVm = guessFletchVm(
         _computeValidatedUri(fletchVm, name: 'fletchVm', base: base));
 
-    if (patchRoot == null  && _PATCH_ROOT != null) {
+    if (patchRoot == null && _PATCH_ROOT != null) {
       patchRoot = executable.resolve(appendSlash(_PATCH_ROOT));
     }
     patchRoot = _computeValidatedUri(
@@ -197,7 +197,7 @@ Try adding command-line option '-Dfletch-patch-root=<path to fletch patch>.""");
       environment = <String, dynamic>{};
     }
 
-    if (nativesJson == null  && _NATIVES_JSON != null) {
+    if (nativesJson == null && _NATIVES_JSON != null) {
       nativesJson = base.resolve(_NATIVES_JSON);
     }
     nativesJson = _computeValidatedUri(
@@ -274,8 +274,10 @@ Try adding command-line option '-Dfletch-natives-json=<path to natives.json>."""
   IncrementalCompiler newIncrementalCompiler(
       IncrementalMode support,
       {List<String> options: const <String>[]}) {
+    // TODO(sigurdm): Remove this hack.
+    Uri correctedLibraryRoot = _compiler.libraryRoot.resolve("..");
     return new IncrementalCompiler(
-        libraryRoot: _compiler.libraryRoot,
+        libraryRoot: correctedLibraryRoot,
         patchRoot: _compiler.patchRoot,
         packageConfig: _compiler.packageConfig,
         fletchVm: _compiler.fletchVm,