From 0bb1730fb9f9898ebbca1a98d9b700005ed2e54a Mon Sep 17 00:00:00 2001 From: William Hesse Date: Mon, 10 Jan 2022 21:30:54 +0000 Subject: [PATCH] Reland "[infra] Remove copy of jsshell to legacy location" This is a reland of 27d3969eaedda668ac92a052469a9d7f0c92cff2 Original change's description: > [infra] Remove copy of jsshell to legacy location > > Fixes: b/186078239 > Change-Id: I963af391e67734b9dc130258a871f9b0a2966858 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214047 > Reviewed-by: Alexander Thomas Change-Id: I38513177d321d9923104776aceb4831669fe73dc Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/227400 Auto-Submit: William Hesse Reviewed-by: Alexander Aprelev Commit-Queue: Alexander Aprelev Reviewed-by: Sigmund Cherem --- DEPS | 9 --------- tools/bots/try_benchmarks.sh | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/DEPS b/DEPS index b4ee2c753fb..521f8de761d 100644 --- a/DEPS +++ b/DEPS @@ -226,15 +226,6 @@ deps = { "condition": "checkout_javascript_engines", "dep_type": "cipd", }, - # TODO(b/186078239): remove this copy to the old location - Var("dart_root") + "/third_party/firefox_jsshell/linux/jsshell": { - "packages": [{ - "package": "dart/third_party/jsshell/linux-amd64", - "version": Var("jsshell_tag"), - }], - "condition": "checkout_javascript_engines", - "dep_type": "cipd", - }, Var("dart_root") + "/third_party/devtools": { "packages": [{ "package": "dart/third_party/flutter/devtools", diff --git a/tools/bots/try_benchmarks.sh b/tools/bots/try_benchmarks.sh index 2fb96f0fefb..3d7f9662f75 100755 --- a/tools/bots/try_benchmarks.sh +++ b/tools/bots/try_benchmarks.sh @@ -296,7 +296,7 @@ EOF out/ReleaseX64/kernel-service.dart.snapshot \ out/ReleaseX64/run_vm_tests \ third_party/d8/linux/x64 \ - third_party/firefox_jsshell/linux/ \ + third_party/firefox_jsshell/ \ out/ReleaseX64/dart_precompiled_runtime \ out/ReleaseX64/gen/utils/dartdevc/kernel/ \ out/ReleaseX64/ddc_outline.dill \ @@ -333,9 +333,9 @@ EOF out/ReleaseX64/dart-sdk/bin/dart2js --sound-null-safety --packages=.packages --out=out.js -m hello.dart third_party/d8/linux/x64/d8 --stack_size=1024 sdk/lib/_internal/js_runtime/lib/preambles/d8.js out.js out/ReleaseX64/dart-sdk/bin/dart2js --packages=.packages --out=out.js -m hello.dart - LD_LIBRARY_PATH=third_party/firefox_jsshell/linux/jsshell/ third_party/firefox_jsshell/linux/jsshell/js -f sdk/lib/_internal/js_runtime/lib/preambles/jsshell.js -f out.js + LD_LIBRARY_PATH=third_party/firefox_jsshell/ third_party/firefox_jsshell/js -f sdk/lib/_internal/js_runtime/lib/preambles/jsshell.js -f out.js out/ReleaseX64/dart-sdk/bin/dart2js --sound-null-safety --packages=.packages --out=out.js -m hello.dart - LD_LIBRARY_PATH=third_party/firefox_jsshell/linux/jsshell/ third_party/firefox_jsshell/linux/jsshell/js -f sdk/lib/_internal/js_runtime/lib/preambles/jsshell.js -f out.js + LD_LIBRARY_PATH=third_party/firefox_jsshell/ third_party/firefox_jsshell/js -f sdk/lib/_internal/js_runtime/lib/preambles/jsshell.js -f out.js out/ReleaseX64/dart-sdk/bin/dart2js --benchmarking-production --packages=.packages --out=out.js -m hello.dart third_party/d8/linux/x64/d8 --stack_size=1024 sdk/lib/_internal/js_runtime/lib/preambles/d8.js out.js out/ReleaseX64/dart-sdk/bin/dart2js --sound-null-safety --benchmarking-production --packages=.packages --out=out.js -m hello.dart