From 296e97f3225c88d856da20ab63e28ca45260f681 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 6 Sep 2019 09:24:14 -0700
Subject: [PATCH] Revert "Correct libraries path and remove dart:io and
 dart:isolate for web dart platform (#39364)" (#39985)

This reverts commit 3f4d27c4bc5a8b3afa868b9dfe187d7585c44848.
---
 .../lib/src/build_runner/build_script.dart    | 20 ++++++-------------
 .../lib/src/build_runner/web_fs.dart          |  6 +-----
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/packages/flutter_tools/lib/src/build_runner/build_script.dart b/packages/flutter_tools/lib/src/build_runner/build_script.dart
index fae6c5c81f1..433abd816b6 100644
--- a/packages/flutter_tools/lib/src/build_runner/build_script.dart
+++ b/packages/flutter_tools/lib/src/build_runner/build_script.dart
@@ -41,16 +41,6 @@ const String jsSourceMapExtension = '.ddc.js.map';
 const String kReleaseFlag = 'release';
 const String kProfileFlag = 'profile';
 
-const Set<String> skipPlatformCheckPackages = <String>{
-  'flutter',
-  'flutter_test',
-  'flutter_driver',
-  'flutter_goldens',
-  'flutter_goldens_client',
-  'flutter_gallery',
-  'connectivity',
-};
-
 final DartPlatform flutterWebPlatform =
     DartPlatform.register('flutter_web', <String>[
   'async',
@@ -73,6 +63,8 @@ final DartPlatform flutterWebPlatform =
   // Flutter web specific libraries.
   'ui',
   '_engine',
+  'io',
+  'isolate',
 ]);
 
 /// The builders required to compile a Flutter application to the web.
@@ -135,7 +127,7 @@ final List<core.BuilderApplication> builders = <core.BuilderApplication>[
               sdkKernelPath: path.join('kernel', 'flutter_ddc_sdk.dill'),
               outputExtension: ddcKernelExtension,
               platform: flutterWebPlatform,
-              librariesPath: path.absolute(path.join(builderOptions.config['flutterWebSdk'], 'libraries.json')),
+              librariesPath: 'libraries.json',
               kernelTargetName: 'ddc',
             ),
         (BuilderOptions builderOptions) => DevCompilerBuilder(
@@ -143,7 +135,7 @@ final List<core.BuilderApplication> builders = <core.BuilderApplication>[
               platform: flutterWebPlatform,
               platformSdk: builderOptions.config['flutterWebSdk'],
               sdkKernelPath: path.url.join('kernel', 'flutter_ddc_sdk.dill'),
-              librariesPath: path.absolute(path.join(builderOptions.config['flutterWebSdk'], 'libraries.json')),
+              librariesPath: 'libraries.json',
             ),
       ],
       core.toAllPackages(),
@@ -209,7 +201,7 @@ class FlutterWebTestEntrypointBuilder implements Builder {
   @override
   Future<void> build(BuildStep buildStep) async {
     log.info('building for target ${buildStep.inputId.path}');
-    await bootstrapDdc(buildStep, platform: flutterWebPlatform, skipPlatformCheckPackages: skipPlatformCheckPackages);
+    await bootstrapDdc(buildStep, platform: flutterWebPlatform);
   }
 }
 
@@ -237,7 +229,7 @@ class FlutterWebEntrypointBuilder implements Builder {
     if (release || profile) {
       await bootstrapDart2Js(buildStep, flutterWebSdk, profile);
     } else {
-      await bootstrapDdc(buildStep, platform: flutterWebPlatform, skipPlatformCheckPackages: skipPlatformCheckPackages);
+      await bootstrapDdc(buildStep, platform: flutterWebPlatform);
     }
   }
 }
diff --git a/packages/flutter_tools/lib/src/build_runner/web_fs.dart b/packages/flutter_tools/lib/src/build_runner/web_fs.dart
index 79373bde89c..5fd49e40a9b 100644
--- a/packages/flutter_tools/lib/src/build_runner/web_fs.dart
+++ b/packages/flutter_tools/lib/src/build_runner/web_fs.dart
@@ -417,11 +417,7 @@ class BuildDaemonCreator {
             }
             break;
           default:
-            if (serverLog.message.contains('Skipping compiling')) {
-              printError(serverLog.message);
-            } else {
-              printTrace(serverLog.message);
-            }
+            printTrace(serverLog.message);
         }
       },
       buildMode: daemon.BuildMode.Manual,