From 51fee27069b4d853421857ad29888d8ae597ba7c Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Wed, 2 Jul 2025 16:29:44 -0700 Subject: [PATCH] [ddc] Update DDC snapshot training target Specify package_config.json when running DDC JIT snapshot training. This allows the build to succeed in environments where the running compiler would go searching for the package_config.json and find one in some parent directory. This should fix local web engine builds in Flutter which likely broke when the repo was migrated to a pub workspace. Change-Id: Ifb5b6357cbf40f04069020ab1b4aee099d0945ed Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/438602 Reviewed-by: Sigmund Cherem Commit-Queue: Nicholas Shahan --- build/rbe/rewrapper_dart.py | 2 ++ utils/ddc/BUILD.gn | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build/rbe/rewrapper_dart.py b/build/rbe/rewrapper_dart.py index 0c22d6c741f..11dfbd69ec0 100644 --- a/build/rbe/rewrapper_dart.py +++ b/build/rbe/rewrapper_dart.py @@ -433,6 +433,8 @@ trace to find the place to insert the appropriate support. self.rebase(self.optarg.replace('.js', '.dill'))) elif self.get_option(['--dart-sdk-summary']): self.extra_paths.add(self.rebase(self.optarg)) + elif self.get_option(['--packages']): + self.extra_paths.add(self.rebase(self.optarg)) elif self.get_option([ '--multi-root-scheme', '--multi-root-output-path', '--modules' diff --git a/utils/ddc/BUILD.gn b/utils/ddc/BUILD.gn index fc6b6287272..879e7e1938e 100644 --- a/utils/ddc/BUILD.gn +++ b/utils/ddc/BUILD.gn @@ -40,6 +40,8 @@ application_snapshot("dartdevc") { main_dart = "../../pkg/dev_compiler/bin/dartdevc.dart" training_args = [ + "--packages", + rebase_path("../../.dart_tool/package_config.json"), "--dart-sdk-summary", rebase_path(sdk_outline_dill), "-o",