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

Unified Diff: pkg/kernel/bin/dartk.dart

Issue 2539783002: Revert "Store library paths relative to a given application root folder." (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « no previous file | pkg/kernel/lib/analyzer/loader.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/kernel/bin/dartk.dart
diff --git a/pkg/kernel/bin/dartk.dart b/pkg/kernel/bin/dartk.dart
index 9d4f6da7ee1f7d759a46426cd70c8195d66dd8fc..e735f9789e5a18560c3dd1c4cca2a6f8b418486a 100755
--- a/pkg/kernel/bin/dartk.dart
+++ b/pkg/kernel/bin/dartk.dart
@@ -10,7 +10,6 @@ import 'batch_util.dart';
import 'package:args/args.dart';
import 'package:kernel/analyzer/loader.dart';
-import 'package:kernel/application_root.dart';
import 'package:kernel/verifier.dart';
import 'package:kernel/kernel.dart';
import 'package:kernel/log.dart';
@@ -37,9 +36,6 @@ ArgParser parser = new ArgParser(allowTrailingOptions: true)
..addOption('packages',
abbr: 'p', help: 'Path to the .packages file or packages folder.')
..addOption('package-root', help: 'Deprecated alias for --packages')
- ..addOption('app-root',
- help: 'Store library paths relative to the given directory.\n'
- 'Defaults to the working directory')
..addOption('target',
abbr: 't',
help: 'Tailor the IR to the given target.',
@@ -248,12 +244,6 @@ Future<CompilerOutcome> batchMain(
String packagePath = options['packages'] ?? options['package-root'];
checkIsFileOrDirectoryOrNull(packagePath, 'Package root or .packages');
- String applicationRootOption = options['app-root'];
- checkIsDirectoryOrNull(applicationRootOption, 'Application root');
- applicationRootOption ??= Directory.current.path;
- applicationRootOption = new File(applicationRootOption).absolute.path;
- var applicationRoot = new ApplicationRoot(applicationRootOption);
-
// Set up logging.
if (options['verbose']) {
log.onRecord.listen((LogRecord rec) {
@@ -307,8 +297,7 @@ Future<CompilerOutcome> batchMain(
sdk: options['sdk'],
packagePath: packagePath,
customUriMappings: customUriMappings,
- declaredVariables: declaredVariables,
- applicationRoot: applicationRoot);
+ declaredVariables: declaredVariables);
String packageDiscoveryPath = batchModeState.isBatchMode ? null : file;
DartLoader loader = await batchModeState.batch.getLoader(
repository, dartOptions,
@@ -317,8 +306,7 @@ Future<CompilerOutcome> batchMain(
program = loader.loadProgram(file, target: target);
} else {
var library = loader.loadLibrary(file);
- assert(library ==
- repository.getLibraryReference(applicationRoot.resolve(file)));
+ assert(library == repository.getLibrary(file));
program = new Program(repository.libraries);
}
errors = loader.errors;
« no previous file with comments | « no previous file | pkg/kernel/lib/analyzer/loader.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698