From e692b26c7ebe97a3fb79b94aaec5a9d810d30cee Mon Sep 17 00:00:00 2001 From: Mark Zhou Date: Thu, 18 Mar 2021 00:30:37 +0000 Subject: [PATCH] Adding SDK dependencies required for expression evaluation tests. This is part of a series of changes to add support for SDK expression eval tests. This change: * Adds SDK dependencies on webkit_inspection_protocol.dart and browser_launcher.dart * Adds dev dependencies to DDC Change-Id: I025a1f1b59e00858a33016818b6746c57c9caec4 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/190961 Commit-Queue: Mark Zhou Reviewed-by: Sigmund Cherem Reviewed-by: Nicholas Shahan Reviewed-by: Anna Gringauze --- .dart_tool/package_config.json | 14 +++++++++++++- .packages | 2 ++ DEPS | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 48079d1a983..5c095edaaad 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -11,7 +11,7 @@ "constraint, update this by running tools/generate_package_config.dart." ], "configVersion": 2, - "generated": "2021-03-15T10:48:35.022974", + "generated": "2021-03-17T11:06:05.181429", "generator": "tools/generate_package_config.dart", "packages": [ { @@ -138,6 +138,12 @@ "packageUri": "lib/", "languageVersion": "2.10" }, + { + "name": "browser_launcher", + "rootUri": "../third_party/pkg/browser_launcher", + "packageUri": "lib/", + "languageVersion": "2.2" + }, { "name": "build_integration", "rootUri": "../pkg/build_integration", @@ -787,6 +793,12 @@ "packageUri": "lib/", "languageVersion": "2.0" }, + { + "name": "webkit_inspection_protocol", + "rootUri": "../third_party/pkg/webkit_inspection_protocol", + "packageUri": "lib/", + "languageVersion": "2.0" + }, { "name": "yaml", "rootUri": "../third_party/pkg/yaml", diff --git a/.packages b/.packages index 3587c4fbe93..5fc05a87bae 100644 --- a/.packages +++ b/.packages @@ -20,6 +20,7 @@ async_helper:pkg/async_helper/lib bazel_worker:third_party/pkg/bazel_worker/lib benchmark_harness:third_party/pkg/benchmark_harness/lib boolean_selector:third_party/pkg/boolean_selector/lib +browser_launcher:third_party/pkg/browser_launcher/lib build_integration:pkg/build_integration/lib charcode:third_party/pkg/charcode/lib cli_util:third_party/pkg/cli_util/lib @@ -118,6 +119,7 @@ vm_snapshot_analysis:pkg/vm_snapshot_analysis/lib wasm:pkg/wasm/lib watcher:third_party/pkg/watcher/lib webdriver:third_party/pkg/webdriver/lib +webkit_inspection_protocol:third_party/pkg/webkit_inspection_protocol/lib web_components:third_party/pkg/web_components/lib web_socket_channel:third_party/pkg/web_socket_channel/lib yaml:third_party/pkg/yaml/lib diff --git a/DEPS b/DEPS index 63717423928..50bd12cc0b0 100644 --- a/DEPS +++ b/DEPS @@ -101,6 +101,7 @@ vars = { "dart_style_tag": "2cf810073e0cc7e7ea05d3de51830e6fa6d62924", "chromedriver_tag": "83.0.4103.39", + "browser_launcher_rev": "74949f0c599095e6fac3cb4581ed4769167576c7", "dartdoc_rev" : "174021f3d76c2a8500b54977c80f32c5bbc099f1", "ffi_rev": "f3346299c55669cc0db48afae85b8110088bf8da", "fixnum_rev": "16d3890c6dc82ca629659da1934e412292508bba", @@ -168,6 +169,7 @@ vars = { "web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02", "web_socket_channel_rev": "76931ea1b81ba71e8319330c35285d3e88566315", "WebCore_rev": "fb11e887f77919450e497344da570d780e078bc8", + "webkit_inspection_protocol_rev": "6b15729292d030f2e5c5861022da4c5a4c11961c", "yaml_rev": "b4c4411631bda556ce9a45af1ab0eecaf9f3ac53", "zlib_rev": "bf44340d1b6be1af8950bbdf664fec0cf5a831cc", "crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed", @@ -313,6 +315,9 @@ deps = { Var("dart_root") + "/third_party/pkg/boolean_selector": Var("dart_git") + "boolean_selector.git" + "@" + Var("boolean_selector_rev"), + Var("dart_root") + "/third_party/pkg/browser_launcher": + Var("dart_git") + "browser_launcher.git" + + "@" + Var("browser_launcher_rev"), Var("dart_root") + "/third_party/pkg/charcode": Var("dart_git") + "charcode.git" + "@" + Var("charcode_rev"), Var("dart_root") + "/third_party/pkg/cli_util": @@ -461,6 +466,9 @@ deps = { Var("dart_root") + "/third_party/pkg/webdriver": Var("dart_git") + "external/github.com/google/webdriver.dart.git" + "@" + Var("webdriver_rev"), + Var("dart_root") + "/third_party/pkg/webkit_inspection_protocol": + Var("dart_git") + "external/github.com/google/webkit_inspection_protocol.dart.git" + + "@" + Var("webkit_inspection_protocol_rev"), Var("dart_root") + "/third_party/pkg/web_socket_channel": Var("dart_git") + "web_socket_channel.git" +