Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: pkg/front_end/lib/src/fasta/fasta.dart

Issue 2895983002: Read SDK and patches from a JSON file. (Closed)
Patch Set: Merged with 1333f97b9a0e3805f991578ef83b0ec4553ecf33 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/front_end/lib/src/fasta/fasta.dart
diff --git a/pkg/front_end/lib/src/fasta/fasta.dart b/pkg/front_end/lib/src/fasta/fasta.dart
index dc5745a288858b421f12d9c33de72aa5d426f2bc..6d1a2a37af246cc0054fb35b64a926073244d614 100644
--- a/pkg/front_end/lib/src/fasta/fasta.dart
+++ b/pkg/front_end/lib/src/fasta/fasta.dart
@@ -124,8 +124,8 @@ class CompileTask {
}
Future<KernelTarget> buildOutline([Uri output]) async {
- TranslateUri uriTranslator = await TranslateUri.parse(
- c.fileSystem, c.options.sdk, c.options.packages);
+ TranslateUri uriTranslator = await TranslateUri
+ .parse(c.fileSystem, c.options.sdk, packages: c.options.packages);
ticker.logMs("Read packages file");
DillTarget dillTarget = createDillTarget(uriTranslator);
KernelTarget kernelTarget =
@@ -196,7 +196,7 @@ Future<CompilationResult> parseScriptInFileSystem(
Program program;
try {
TranslateUri uriTranslator =
- await TranslateUri.parse(fileSystem, null, packages);
+ await TranslateUri.parse(fileSystem, patchedSdk, packages: packages);
final Ticker ticker = new Ticker(isVerbose: verbose);
final DillTarget dillTarget =
new DillTarget(ticker, uriTranslator, backendTarget);
@@ -254,7 +254,8 @@ Future compilePlatform(Uri patchedSdk, Uri fullOutput,
}
Future writeDepsFile(Uri script, Uri depsFile, Uri output,
- {Uri packages,
+ {Uri sdk,
+ Uri packages,
Uri platform,
Iterable<Uri> extraDependencies,
bool verbose: false,
@@ -267,9 +268,10 @@ Future writeDepsFile(Uri script, Uri depsFile, Uri output,
if (verbose) {
c.options.options["--verbose"] = true;
}
+ sdk ??= c.options.sdk;
- TranslateUri uriTranslator = await TranslateUri.parse(
- c.fileSystem, c.options.sdk, c.options.packages);
+ TranslateUri uriTranslator = await TranslateUri.parse(c.fileSystem, sdk,
+ packages: c.options.packages);
ticker.logMs("Read packages file");
DillTarget dillTarget =
new DillTarget(ticker, uriTranslator, backendTarget);
« no previous file with comments | « pkg/front_end/lib/src/fasta/dill/dill_target.dart ('k') | pkg/front_end/lib/src/fasta/kernel/body_builder.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698