Merge DDC's libraries specification into the sdk/lib/libraries.json file

Change-Id: I3f8076a3726aec0636e63173df8ec2a2c75d225e Reviewed-on: https://dart-review.googlesource.com/66740 Reviewed-by: Jenny Messerly <jmesserly@google.com> Commit-Queue: Sigmund Cherem <sigmund@google.com>
2024-10-14 08:51:21 +00:00 · 2018-07-26 22:31:51 +00:00 · 2018-07-26 22:31:51 +00:00 · d5b5736a47
parent bad8de3156
commit d5b5736a47
5 changed files with 269 additions and 151 deletions
--- a/pkg/dev_compiler/tool/input_sdk/libraries.json
+++ b/pkg/dev_compiler/tool/input_sdk/libraries.json
@ -1,99 +0,0 @@
-{
-  "dartdevc": {
-    "libraries": {
-      "_runtime": {
-        "uri": "_internal/js_runtime/lib/ddc_runtime/runtime.dart"
-      },
-      "_debugger": {
-        "uri": "_internal/js_runtime/lib/debugger.dart"
-      },
-      "_foreign_helper": {
-        "uri": "_internal/js_runtime/lib/foreign_helper.dart"
-      },
-      "_http": {
-        "uri": "_http/http.dart"
-      },
-      "_interceptors": {
-        "uri": "_internal/js_runtime/lib/interceptors.dart"
-      },
-      "_internal": {
-        "uri": "internal/internal.dart"
-      },
-      "_isolate_helper": {
-        "uri": "_internal/js_runtime/lib/isolate_helper.dart"
-      },
-      "_js_helper": {
-        "uri": "_internal/js_runtime/lib/js_helper.dart"
-      },
-      "_js_mirrors": {
-        "uri": "_internal/js_runtime/lib/js_mirrors.dart"
-      },
-      "_js_primitives": {
-        "uri": "_internal/js_runtime/lib/js_primitives.dart"
-      },
-      "_metadata": {
-        "uri": "html/html_common/metadata.dart"
-      },
-      "_native_typed_data": {
-        "uri": "_internal/js_runtime/lib/native_typed_data.dart"
-      },
-      "async": {
-        "uri": "async/async.dart"
-      },
-      "collection": {
-        "uri": "collection/collection.dart"
-      },
-      "convert": {
-        "uri": "convert/convert.dart"
-      },
-      "core": {
-        "uri": "core/core.dart"
-      },
-      "developer": {
-        "uri": "developer/developer.dart"
-      },
-      "io": {
-        "uri": "io/io.dart"
-      },
-      "isolate": {
-        "uri": "isolate/isolate.dart"
-      },
-      "mirrors": {
-        "uri": "mirrors/mirrors.dart"
-      },
-      "math": {
-        "uri": "math/math.dart"
-      },
-      "typed_data": {
-        "uri": "typed_data/typed_data.dart"
-      },
-      "html": {
-        "uri": "html/dart2js/html_dart2js.dart"
-      },
-      "html_common": {
-        "uri": "html/html_common/html_common_dart2js.dart"
-      },
-      "indexed_db": {
-        "uri": "indexed_db/dart2js/indexed_db_dart2js.dart"
-      },
-      "js": {
-        "uri": "js/dart2js/js_dart2js.dart"
-      },
-      "js_util": {
-        "uri": "js_util/dart2js/js_util_dart2js.dart"
-      },
-      "svg": {
-        "uri": "svg/dart2js/svg_dart2js.dart"
-      },
-      "web_audio": {
-        "uri": "web_audio/dart2js/web_audio_dart2js.dart"
-      },
-      "web_gl": {
-        "uri": "web_gl/dart2js/web_gl_dart2js.dart"
-      },
-      "web_sql": {
-        "uri": "web_sql/dart2js/web_sql_dart2js.dart"
-      }
-    }
-  }
-}
--- a/pkg/dev_compiler/tool/kernel_sdk.dart
+++ b/pkg/dev_compiler/tool/kernel_sdk.dart
@ -43,6 +43,8 @@ Future main(List<String> args) async {
    ..compileSdk = true
    ..packagesFileUri = path.toUri(path.absolute('../../.packages'))
    ..sdkRoot = path.toUri(inputPath)
+    ..librariesSpecificationUri =
+        Uri.base.resolve('../../sdk/lib/libraries.json')
    ..target = target;

  var inputs = target.extraRequiredLibraries.map(Uri.parse).toList();
--- a/pkg/dev_compiler/tool/patch_sdk.dart
+++ b/pkg/dev_compiler/tool/patch_sdk.dart
@ -41,13 +41,11 @@ void main(List<String> argv) {

  var INTERNAL_PATH = '_internal/js_runtime/lib/';

-  // Copy libraries.dart, libraries.json and version
+  // Copy libraries.dart and version
  var librariesDart = path.join(patchDir, 'libraries.dart');
  var libContents = File(librariesDart).readAsStringSync();
  // TODO(jmesserly): can we remove this?
  _writeSync(path.join(sdkOut, '_internal', 'libraries.dart'), libContents);
-  _writeSync(path.join(sdkOut, 'libraries.json'),
-      File(path.join(patchDir, 'libraries.json')).readAsStringSync());
  _writeSync(
      path.join(
          sdkOut, '_internal', 'sdk_library_metadata', 'lib', 'libraries.dart'),
--- a/sdk/lib/libraries.json
+++ b/sdk/lib/libraries.json
@ -259,20 +259,160 @@
      }
    }
  },
+  "dartdevc": {
+    "libraries": {
+      "async": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart",
+        "uri": "async/async.dart"
+      },
+      "_runtime": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart"
+      },
+      "_interceptors": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/interceptors.dart"
+      },
+      "mirrors": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart",
+        "supported": false,
+        "uri": "mirrors/mirrors.dart"
+      },
+      "_debugger": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/debugger.dart"
+      },
+      "io": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart",
+        "supported": false,
+        "uri": "io/io.dart"
+      },
+      "_internal": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart",
+        "uri": "internal/internal.dart"
+      },
+      "_metadata": {
+        "uri": "html/html_common/metadata.dart"
+      },
+      "_http": {
+        "uri": "_http/http.dart"
+      },
+      "_js_primitives": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart"
+      },
+      "_js_helper": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/js_helper.dart"
+      },
+      "js": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart"
+      },
+      "_js_mirrors": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart"
+      },
+      "html_common": {
+        "uri": "html/html_common/html_common_dart2js.dart"
+      },
+      "_native_typed_data": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart"
+      },
+      "core": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart",
+        "uri": "core/core.dart"
+      },
+      "js_util": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart"
+      },
+      "collection": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart",
+        "uri": "collection/collection.dart"
+      },
+      "typed_data": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart",
+        "uri": "typed_data/typed_data.dart"
+      },
+      "web_audio": {
+        "uri": "web_audio/dart2js/web_audio_dart2js.dart"
+      },
+      "html": {
+        "uri": "html/dart2js/html_dart2js.dart"
+      },
+      "developer": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart",
+        "uri": "developer/developer.dart"
+      },
+      "isolate": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart",
+        "uri": "isolate/isolate.dart"
+      },
+      "web_gl": {
+        "uri": "web_gl/dart2js/web_gl_dart2js.dart"
+      },
+      "indexed_db": {
+        "uri": "indexed_db/dart2js/indexed_db_dart2js.dart"
+      },
+      "convert": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart",
+        "uri": "convert/convert.dart"
+      },
+      "_isolate_helper": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart"
+      },
+      "math": {
+        "patches": "../../pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart",
+        "uri": "math/math.dart"
+      },
+      "_foreign_helper": {
+        "uri": "../../pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart"
+      },
+      "web_sql": {
+        "uri": "web_sql/dart2js/web_sql_dart2js.dart"
+      },
+      "svg": {
+        "uri": "svg/dart2js/svg_dart2js.dart"
+      }
+    }
+  },
  "dart2js_server": {
    "libraries": {
+      "_native_typed_data": {
+        "uri": "_internal/js_runtime/lib/native_typed_data.dart"
+      },
+      "_js_names": {
+        "uri": "_internal/js_runtime/lib/js_names.dart"
+      },
+      "core": {
+        "patches": "_internal/js_runtime/lib/core_patch.dart",
+        "uri": "core/core.dart"
+      },
      "async": {
        "patches": "_internal/js_runtime/lib/async_patch.dart",
        "uri": "async/async.dart"
      },
+      "collection": {
+        "patches": "_internal/js_runtime/lib/collection_patch.dart",
+        "uri": "collection/collection.dart"
+      },
+      "js_util": {
+        "uri": "js_util/dart2js/js_util_dart2js.dart"
+      },
+      "typed_data": {
+        "patches": "_internal/js_runtime/lib/typed_data_patch.dart",
+        "uri": "typed_data/typed_data.dart"
+      },
+      "_interceptors": {
+        "uri": "_internal/js_runtime/lib/interceptors.dart"
+      },
+      "developer": {
+        "patches": "_internal/js_runtime/lib/developer_patch.dart",
+        "uri": "developer/developer.dart"
+      },
+      "isolate": {
+        "patches": "_internal/js_runtime/lib/isolate_patch.dart",
+        "supported": false,
+        "uri": "isolate/isolate.dart"
+      },
      "mirrors": {
        "patches": "_internal/js_runtime/lib/mirrors_patch_cfe.dart",
        "supported": false,
        "uri": "mirrors/mirrors.dart"
      },
-      "_interceptors": {
-        "uri": "_internal/js_runtime/lib/interceptors.dart"
-      },
      "_js_embedded_names": {
        "uri": "_internal/js_runtime/lib/shared/embedded_names.dart"
      },
@ -285,55 +425,13 @@
        "patches": "_internal/js_runtime/lib/internal_patch.dart",
        "uri": "internal/internal.dart"
      },
-      "_async_await_error_codes": {
-        "uri": "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
-      },
-      "_http": {
-        "uri": "_http/http.dart"
-      },
-      "_js_helper": {
-        "uri": "_internal/js_runtime/lib/js_helper.dart"
-      },
-      "_js_primitives": {
-        "uri": "_internal/js_runtime/lib/js_primitives.dart"
-      },
-      "js": {
-        "uri": "js/dart2js/js_dart2js.dart"
-      },
-      "_native_typed_data": {
-        "uri": "_internal/js_runtime/lib/native_typed_data.dart"
-      },
-      "core": {
-        "patches": "_internal/js_runtime/lib/core_patch.dart",
-        "uri": "core/core.dart"
-      },
-      "_js_names": {
-        "uri": "_internal/js_runtime/lib/js_names.dart"
-      },
-      "js_util": {
-        "uri": "js_util/dart2js/js_util_dart2js.dart"
-      },
-      "collection": {
-        "patches": "_internal/js_runtime/lib/collection_patch.dart",
-        "uri": "collection/collection.dart"
-      },
-      "typed_data": {
-        "patches": "_internal/js_runtime/lib/typed_data_patch.dart",
-        "uri": "typed_data/typed_data.dart"
-      },
-      "isolate": {
-        "patches": "_internal/js_runtime/lib/isolate_patch.dart",
-        "supported": false,
-        "uri": "isolate/isolate.dart"
-      },
-      "developer": {
-        "patches": "_internal/js_runtime/lib/developer_patch.dart",
-        "uri": "developer/developer.dart"
-      },
      "_js": {
        "patches": "js/_js_server.dart",
        "uri": "js/_js.dart"
      },
+      "_async_await_error_codes": {
+        "uri": "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
+      },
      "convert": {
        "patches": "_internal/js_runtime/lib/convert_patch.dart",
        "uri": "convert/convert.dart"
@ -344,7 +442,19 @@
      },
      "_foreign_helper": {
        "uri": "_internal/js_runtime/lib/foreign_helper.dart"
+      },
+      "_http": {
+        "uri": "_http/http.dart"
+      },
+      "_js_primitives": {
+        "uri": "_internal/js_runtime/lib/js_primitives.dart"
+      },
+      "_js_helper": {
+        "uri": "_internal/js_runtime/lib/js_helper.dart"
+      },
+      "js": {
+        "uri": "js/dart2js/js_dart2js.dart"
      }
    }
  }
-}
+}
--- a/sdk/lib/libraries.yaml
+++ b/sdk/lib/libraries.yaml
@ -341,3 +341,110 @@ dart2js_server:

    _async_await_error_codes:
      uri: "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
+dartdevc:
+    libraries:
+      _runtime:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart"
+
+      _debugger:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/debugger.dart"
+
+      _foreign_helper:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart"
+
+      _http:
+        uri: "_http/http.dart"
+
+      _interceptors:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/interceptors.dart"
+
+      _internal:
+        uri: "internal/internal.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart"
+
+      _isolate_helper:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart"
+
+      _js_helper:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/js_helper.dart"
+
+      _js_mirrors:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart"
+
+      _js_primitives:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart"
+
+      _metadata:
+        uri: "html/html_common/metadata.dart"
+
+      _native_typed_data:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart"
+
+      async:
+        uri: "async/async.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart"
+
+      collection:
+        uri: "collection/collection.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart"
+
+      convert:
+        uri: "convert/convert.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart"
+
+      core:
+        uri: "core/core.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart"
+
+      developer:
+        uri: "developer/developer.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart"
+
+      io:
+        uri: "io/io.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart"
+        supported: false
+
+      isolate:
+        uri: "isolate/isolate.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart"
+
+      mirrors:
+        uri: "mirrors/mirrors.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart"
+        supported: false
+
+      math:
+        uri: "math/math.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart"
+
+      typed_data:
+        uri: "typed_data/typed_data.dart"
+        patches: "../../pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart"
+
+      html:
+        uri: "html/dart2js/html_dart2js.dart"
+
+      html_common:
+        uri: "html/html_common/html_common_dart2js.dart"
+
+      indexed_db:
+        uri: "indexed_db/dart2js/indexed_db_dart2js.dart"
+
+      js:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart"
+
+      js_util:
+        uri: "../../pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart"
+
+      svg:
+        uri: "svg/dart2js/svg_dart2js.dart"
+
+      web_audio:
+        uri: "web_audio/dart2js/web_audio_dart2js.dart"
+
+      web_gl:
+        uri: "web_gl/dart2js/web_gl_dart2js.dart"
+
+      web_sql:
+        uri: "web_sql/dart2js/web_sql_dart2js.dart"