diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn
index 142f6606496..175f6a823e6 100644
--- a/web_sdk/BUILD.gn
+++ b/web_sdk/BUILD.gn
@@ -98,6 +98,7 @@ copy("web_ui_library") {
 # Compile the DDC SDK's summary.
 prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
   deps = [
+    "//third_party/dart:create_sdk",        
     "//third_party/dart/pkg:pkg_files_stamp",
     "//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
     "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
@@ -120,9 +121,9 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
     "--multi-root-scheme",
     "org-dartlang-sdk",
     "--multi-root",
-    rebase_path("../../"),
+    "file:///" + rebase_path("$root_out_dir"),
     "--libraries-file",
-    "file:///" + rebase_path("$root_out_dir/flutter_web_sdk/libraries.json"),
+    "org-dartlang-sdk:///flutter_web_sdk/libraries.json",
     "--output",
     rebase_path(sdk_dill),
     "--source",
@@ -139,6 +140,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
 # Compiles the DDC SDK's JS code.
 prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
   deps = [
+    "//third_party/dart:create_sdk",      
     "//third_party/dart/pkg:pkg_files_stamp",
     "//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
     "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
@@ -169,11 +171,12 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
     "--multi-root-scheme",
     "org-dartlang-sdk",
     "--multi-root",
-    rebase_path("../../"),
+    "file:///" + rebase_path("$root_out_dir"),
     "--multi-root-output-path",
     rebase_path("$root_out_dir/"),
     "--libraries-file",
-    "file:///" + rebase_path("$root_out_dir/flutter_web_sdk/libraries.json"),
+    "org-dartlang-sdk:///flutter_web_sdk/libraries.json",
+    "--inline-source-map",
     "--modules",
     "amd",
     "-o",
diff --git a/web_sdk/libraries.json b/web_sdk/libraries.json
index 9719dbff000..05399c13b7d 100644
--- a/web_sdk/libraries.json
+++ b/web_sdk/libraries.json
@@ -48,9 +48,6 @@
       "ui": {
         "uri": "lib/ui/ui.dart"
       },
-      "_engine": {
-        "uri": "lib/_engine/engine.dart"
-      },
       "js": {
         "uri": "../dart-sdk/lib/js/dart2js/js_dart2js.dart"
       },
@@ -116,123 +113,126 @@
       },
       "svg": {
         "uri": "../dart-sdk/lib/svg/dart2js/svg_dart2js.dart"
+      },
+      "_engine": {
+        "uri": "lib/_engine/engine.dart"
       }
     }
   },
   "dartdevc": {
     "libraries": {
       "async": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/async/async.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart",
+        "uri": "../dart-sdk/lib/async/async.dart"
       },
       "_runtime": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart"
       },
       "_interceptors": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/interceptors.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/interceptors.dart"
       },
       "mirrors": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/mirrors_patch.dart",
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/mirrors_patch.dart",
         "supported": false,
-        "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart"
+        "uri": "../dart-sdk/lib/mirrors/mirrors.dart"
       },
       "_debugger": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/debugger.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/debugger.dart"
       },
       "io": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart",
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart",
         "supported": false,
-        "uri": "../../../third_party/dart/sdk/lib/io/io.dart"
+        "uri": "../dart-sdk/lib/io/io.dart"
       },
       "_internal": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/internal/internal.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart",
+        "uri": "../dart-sdk/lib/internal/internal.dart"
       },
       "_metadata": {
-        "uri": "../../../third_party/dart/sdk/lib/html/html_common/metadata.dart"
+        "uri": "../dart-sdk/lib/html/html_common/metadata.dart"
       },
       "_http": {
-        "uri": "../../../third_party/dart/sdk/lib/_http/http.dart"
+        "uri": "../dart-sdk/lib/_http/http.dart"
       },
       "_js_primitives": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart"
       },
       "_js_helper": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_helper.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/js_helper.dart"
       },
       "ui": {
         "uri": "lib/ui/ui.dart"
       },
-      "_engine": {
-        "uri": "lib/_engine/engine.dart"
-      },
       "js": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js/dart2js/js_dart2js.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/lib/js/dart2js/js_dart2js.dart"
       },
       "_js_mirrors": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_mirrors.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/js_mirrors.dart"
       },
       "html_common": {
-        "uri": "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart"
+        "uri": "../dart-sdk/lib/html/html_common/html_common_dart2js.dart"
       },
       "_native_typed_data": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart"
       },
       "core": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/core/core.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart",
+        "uri": "../dart-sdk/lib/core/core.dart"
       },
       "js_util": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js_util/dart2js/js_util_dart2js.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/lib/js_util/dart2js/js_util_dart2js.dart"
       },
       "collection": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/collection/collection.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart",
+        "uri": "../dart-sdk/lib/collection/collection.dart"
       },
       "typed_data": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart",
+        "uri": "../dart-sdk/lib/typed_data/typed_data.dart"
       },
       "web_audio": {
-        "uri": "../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
+        "uri": "../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
       },
       "html": {
-        "uri": "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart"
+        "uri": "../dart-sdk/lib/html/dart2js/html_dart2js.dart"
       },
       "developer": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/developer/developer.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart",
+        "uri": "../dart-sdk/lib/developer/developer.dart"
       },
       "isolate": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart",
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart",
         "supported": false,
-        "uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart"
+        "uri": "../dart-sdk/lib/isolate/isolate.dart"
       },
       "web_gl": {
-        "uri": "../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
+        "uri": "../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
       },
       "indexed_db": {
-        "uri": "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
+        "uri": "../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
       },
       "convert": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/convert/convert.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart",
+        "uri": "../dart-sdk/lib/convert/convert.dart"
       },
       "_isolate_helper": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart"
       },
       "math": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/math/math.dart"
+        "patches": "../dart-sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart",
+        "uri": "../dart-sdk/lib/math/math.dart"
       },
       "_foreign_helper": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart"
+        "uri": "../dart-sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart"
       },
       "web_sql": {
-        "uri": "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
+        "uri": "../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
       },
       "svg": {
-        "uri": "../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart"
+        "uri": "../dart-sdk/lib/svg/dart2js/svg_dart2js.dart"
+      },
+      "_engine": {
+        "uri": "lib/_engine/engine.dart"
       }
     }
   }
diff --git a/web_sdk/libraries.yaml b/web_sdk/libraries.yaml
index 708c2dfc38d..3dcc8b4483d 100644
--- a/web_sdk/libraries.yaml
+++ b/web_sdk/libraries.yaml
@@ -16,116 +16,116 @@
 dartdevc:
   libraries:
     _runtime:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart"
 
     _debugger:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/debugger.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/debugger.dart"
 
     _foreign_helper:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart"
 
     _http:
-      uri: "../../third_party/dart/sdk/lib/_http/http.dart"
+      uri: "../dart-sdk/lib/_http/http.dart"
 
     _interceptors:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/interceptors.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/interceptors.dart"
 
     _internal:
-      uri: "../../third_party/dart/sdk/lib/internal/internal.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart"
+      uri: "../dart-sdk/lib/internal/internal.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart"
 
     _isolate_helper:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart"
 
     _js_helper:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_helper.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/js_helper.dart"
 
     _js_mirrors:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_mirrors.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/js_mirrors.dart"
 
     _js_primitives:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart"
 
     _metadata:
-      uri: "../../third_party/dart/sdk/lib/html/html_common/metadata.dart"
+      uri: "../dart-sdk/lib/html/html_common/metadata.dart"
 
     _native_typed_data:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart"
 
     async:
-      uri: "../../third_party/dart/sdk/lib/async/async.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart"
+      uri: "../dart-sdk/lib/async/async.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart"
 
     collection:
-      uri: "../../third_party/dart/sdk/lib/collection/collection.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart"
+      uri: "../dart-sdk/lib/collection/collection.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart"
 
     convert:
-      uri: "../../third_party/dart/sdk/lib/convert/convert.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart"
+      uri: "../dart-sdk/lib/convert/convert.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart"
 
     core:
-      uri: "../../third_party/dart/sdk/lib/core/core.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart"
+      uri: "../dart-sdk/lib/core/core.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart"
 
     developer:
-      uri: "../../third_party/dart/sdk/lib/developer/developer.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart"
+      uri: "../dart-sdk/lib/developer/developer.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart"
 
     io:
-      uri: "../../third_party/dart/sdk/lib/io/io.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart"
+      uri: "../dart-sdk/lib/io/io.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart"
       supported: false
 
     isolate:
-      uri: "../../third_party/dart/sdk/lib/isolate/isolate.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart"
+      uri: "../dart-sdk/lib/isolate/isolate.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart"
       supported: false
 
     mirrors:
-      uri: "../../third_party/dart/sdk/lib/mirrors/mirrors.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/mirrors_patch.dart"
+      uri: "../dart-sdk/lib/mirrors/mirrors.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/mirrors_patch.dart"
       supported: false
 
     math:
-      uri: "../../third_party/dart/sdk/lib/math/math.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart"
+      uri: "../dart-sdk/lib/math/math.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart"
 
     typed_data:
-      uri: "../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
-      patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart"
+      uri: "../dart-sdk/lib/typed_data/typed_data.dart"
+      patches: "../dart-sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart"
 
     html:
-      uri: "../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart"
+      uri: "../dart-sdk/lib/html/dart2js/html_dart2js.dart"
 
     html_common:
-      uri: "../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart"
+      uri: "../dart-sdk/lib/html/html_common/html_common_dart2js.dart"
 
     indexed_db:
-      uri: "../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
+      uri: "../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
 
     js:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js/dart2js/js_dart2js.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/lib/js/dart2js/js_dart2js.dart"
 
     js_util:
-      uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js_util/dart2js/js_util_dart2js.dart"
+      uri: "../dart-sdk/lib/_internal/js_dev_runtime/lib/js_util/dart2js/js_util_dart2js.dart"
 
     svg:
-      uri: "../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart"
+      uri: "../dart-sdk/lib/svg/dart2js/svg_dart2js.dart"
 
     web_audio:
-      uri: "../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
+      uri: "../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
 
     web_gl:
-      uri: "../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
+      uri: "../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
 
     web_sql:
-      uri: "../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
+      uri: "../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
 
     ui:
       uri: "lib/ui/ui.dart"
 
-  _engine:
+    _engine:
       uri: "lib/_engine/engine.dart"
 
 dart2js: